diff --git a/Gemfile b/Gemfile index eede7c5..ed441e9 100644 --- a/Gemfile +++ b/Gemfile @@ -23,8 +23,8 @@ gem 'cancan', '1.6.5' gem 'capistrano', '2.5.21' # For avatar images: https://github.com/jnicklas/carrierwave -gem 'rmagick', '2.9.2' -gem 'carrierwave', '0.6.2' +# gem 'rmagick', '2.9.2' +# gem 'carrierwave', '0.6.2' # https://github.com/jnunemaker/twitter gem 'twitter', '2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5b5f279..43abfc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,9 +52,6 @@ GEM net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.0.0) - carrierwave (0.6.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -141,7 +138,6 @@ GEM rdoc (3.12) json (~> 1.4) responders (0.6.5) - rmagick (2.9.2) sass (3.1.19) sass-rails (3.2.5) railties (~> 3.2.0) @@ -179,14 +175,12 @@ DEPENDENCIES bourbon (= 1.4.0) cancan (= 1.6.5) capistrano (= 2.5.21) - carrierwave (= 0.6.2) coffee-rails (= 3.2.2) devise (= 2.0.4) json (= 1.6.5) mail mysql2 (= 0.3.11) rails (= 3.2.11) - rmagick (= 2.9.2) sass-rails (= 3.2.5) twitter (= 2.5.0) uglifier