Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install.
This commit is contained in:
parent
814ef38fa9
commit
dcf7e57a1d
2 changed files with 4 additions and 10 deletions
2
Gemfile
2
Gemfile
|
|
@ -38,7 +38,7 @@ gem 'thin', '1.2.7', :require => false
|
|||
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
|
||||
|
||||
#File uploading
|
||||
gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master'
|
||||
gem 'carrierwave', '0.5.2'
|
||||
gem 'mini_magick', '3.2'
|
||||
gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
|
||||
gem 'fastercsv', '1.5.4', :require => false
|
||||
|
|
|
|||
12
Gemfile.lock
12
Gemfile.lock
|
|
@ -36,14 +36,6 @@ GIT
|
|||
multi_xml (~> 0.2.0)
|
||||
simple_oauth (~> 0.1.2)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/recruitmilitary/carrierwave.git
|
||||
revision: a30bb2603a51b646fd771065d6c203abef2e936e
|
||||
branch: master
|
||||
specs:
|
||||
carrierwave (0.5.0)
|
||||
activesupport (~> 3.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/zhitomirskiyi/devise_invitable.git
|
||||
revision: 85abb5fef4ab4f74db818ed3d8104c2f7d24b94e
|
||||
|
|
@ -119,6 +111,8 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
selenium-webdriver (>= 0.0.3)
|
||||
carrierwave (0.5.2)
|
||||
activesupport (~> 3.0)
|
||||
cgi_multipart_eof_fix (2.5.0)
|
||||
chef (0.9.12)
|
||||
bunny (>= 0.6.0)
|
||||
|
|
@ -388,7 +382,7 @@ DEPENDENCIES
|
|||
capistrano (= 2.5.19)
|
||||
capistrano-ext (= 1.2.1)
|
||||
capybara (~> 0.3.9)
|
||||
carrierwave!
|
||||
carrierwave (= 0.5.2)
|
||||
chef (= 0.9.12)
|
||||
cloudfiles (= 1.4.10)
|
||||
cucumber-rails (= 0.3.2)
|
||||
|
|
|
|||
Loading…
Reference in a new issue