remove old gems from gemfile, upgrade aws/paperclip

This commit is contained in:
Devin Howard 2016-10-02 15:06:10 +08:00
parent 7ec9feff80
commit 31aa51ba7f
2 changed files with 26 additions and 54 deletions

26
Gemfile
View file

@ -5,44 +5,34 @@ ruby '2.3.0'
gem 'rails', '~> 5.0.0' gem 'rails', '~> 5.0.0'
gem 'active_model_serializers' gem 'active_model_serializers'
gem 'aws-sdk', '< 2.0' gem 'aws-sdk'
gem 'best_in_place' gem 'best_in_place'
gem 'delayed_job' gem 'delayed_job'
gem 'delayed_job_active_record' gem 'delayed_job_active_record'
gem 'devise' gem 'devise'
gem 'doorkeeper', '~> 4.0.0.rc4' gem 'doorkeeper'
gem 'dotenv-rails' gem 'dotenv-rails'
gem 'exception_notification' gem 'exception_notification'
gem 'formtastic'
gem 'formula'
gem 'httparty' gem 'httparty'
gem 'json' gem 'json'
gem 'kaminari' gem 'kaminari'
gem 'paperclip', '~> 4.3.6' gem 'paperclip'
gem 'pg' gem 'pg'
gem 'pundit' gem 'pundit'
gem 'pundit_extra' gem 'pundit_extra'
gem 'rack-cors'
gem 'rack-attack' gem 'rack-attack'
gem 'rack-cors'
gem 'redis' gem 'redis'
gem 'slack-notifier' gem 'slack-notifier'
gem 'snorlax' gem 'snorlax'
gem 'uservoice-ruby' gem 'uservoice-ruby'
# asset stuff
gem 'coffee-rails'
gem 'jquery-rails' gem 'jquery-rails'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem 'jbuilder' gem 'sass-rails'
gem 'rails3-jquery-autocomplete' gem 'uglifier'
group :assets do
gem 'coffee-rails'
gem 'sass-rails'
gem 'uglifier'
end
group :production do
gem 'rails_12factor'
end
group :test do group :test do
gem 'factory_girl_rails' gem 'factory_girl_rails'

View file

@ -46,11 +46,12 @@ GEM
addressable (2.3.8) addressable (2.3.8)
arel (7.1.2) arel (7.1.2)
ast (2.3.0) ast (2.3.0)
aws-sdk (1.66.0) aws-sdk (2.6.3)
aws-sdk-v1 (= 1.66.0) aws-sdk-resources (= 2.6.3)
aws-sdk-v1 (1.66.0) aws-sdk-core (2.6.3)
json (~> 1.4) jmespath (~> 1.0)
nokogiri (>= 1.4.4) aws-sdk-resources (2.6.3)
aws-sdk-core (= 2.6.3)
bcrypt (3.1.11) bcrypt (3.1.11)
best_in_place (3.1.0) best_in_place (3.1.0)
actionpack (>= 3.2) actionpack (>= 3.2)
@ -91,7 +92,7 @@ GEM
warden (~> 1.2.3) warden (~> 1.2.3)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
doorkeeper (4.0.0) doorkeeper (4.2.0)
railties (>= 4.2) railties (>= 4.2)
dotenv (2.1.1) dotenv (2.1.1)
dotenv-rails (2.1.1) dotenv-rails (2.1.1)
@ -108,18 +109,12 @@ GEM
factory_girl_rails (4.7.0) factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0) factory_girl (~> 4.7.0)
railties (>= 3.0.0) railties (>= 3.0.0)
formtastic (3.1.4)
actionpack (>= 3.2.13)
formula (1.1.1)
rails (> 3.0.0)
globalid (0.3.7) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
httparty (0.14.0) httparty (0.14.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.6.0) jmespath (1.3.1)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.2.1) jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
@ -142,10 +137,9 @@ GEM
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mimemagic (0.3.0) mimemagic (0.3.2)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.1)
multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.5.5)
nio4r (1.2.1) nio4r (1.2.1)
nokogiri (1.6.8) nokogiri (1.6.8)
@ -153,12 +147,12 @@ GEM
pkg-config (~> 1.1.7) pkg-config (~> 1.1.7)
oauth (0.5.1) oauth (0.5.1)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (4.3.7) paperclip (5.1.0)
activemodel (>= 3.2.0) activemodel (>= 4.2.0)
activesupport (>= 3.2.0) activesupport (>= 4.2.0)
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (= 0.3.0) mimemagic (~> 0.3.0)
parser (2.3.1.4) parser (2.3.1.4)
ast (~> 2.2) ast (~> 2.2)
pg (0.19.0) pg (0.19.0)
@ -199,13 +193,6 @@ GEM
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
rails3-jquery-autocomplete (1.0.15)
rails (>= 3.2)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.0.0.1) railties (5.0.0.1)
actionpack (= 5.0.0.1) actionpack (= 5.0.0.1)
activesupport (= 5.0.0.1) activesupport (= 5.0.0.1)
@ -290,7 +277,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
active_model_serializers active_model_serializers
aws-sdk (< 2.0) aws-sdk
best_in_place best_in_place
better_errors better_errors
binding_of_caller binding_of_caller
@ -299,20 +286,17 @@ DEPENDENCIES
delayed_job delayed_job
delayed_job_active_record delayed_job_active_record
devise devise
doorkeeper (~> 4.0.0.rc4) doorkeeper
dotenv-rails dotenv-rails
exception_notification exception_notification
factory_girl_rails factory_girl_rails
formtastic
formula
httparty httparty
jbuilder
jquery-rails jquery-rails
jquery-ui-rails jquery-ui-rails
json json
json-schema json-schema
kaminari kaminari
paperclip (~> 4.3.6) paperclip
pg pg
pry-byebug pry-byebug
pry-rails pry-rails
@ -321,8 +305,6 @@ DEPENDENCIES
rack-attack rack-attack
rack-cors rack-cors
rails (~> 5.0.0) rails (~> 5.0.0)
rails3-jquery-autocomplete
rails_12factor
redis redis
rspec-rails rspec-rails
rubocop rubocop
@ -339,4 +321,4 @@ RUBY VERSION
ruby 2.3.0p0 ruby 2.3.0p0
BUNDLED WITH BUNDLED WITH
1.12.5 1.13.2