Skip to content

Commit

Permalink
Upgrade to and begin testing Paperclip 5.0.0beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
toastercup committed Apr 18, 2016
1 parent 6dbc417 commit 5ddace5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gem 'doorkeeper', '~> 3.1'
# ActiveRecord
gem 'rails-observers', '~> 0.1.2'
gem 'awesome_nested_set', '~> 3.0'
gem 'paperclip', git: 'git://github.com/thoughtbot/paperclip', branch: 'master'
gem 'paperclip', '~> 5.0.0.beta1'
gem 'paperclip-optimizer', '~> 2.0'
gem 'acts-as-taggable-on', '~> 3.5'
gem 'bcrypt', '~> 3.1.11'
Expand Down
20 changes: 7 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@ GIT
execjs
rails (>= 3.1)

GIT
remote: git://github.com/thoughtbot/paperclip
revision: e60f00027704298455c039e111d96bcf46e12822
branch: master
specs:
paperclip (4.3.1)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)

GIT
remote: git://github.com/toastercup/grape-kaminari
revision: 8d3f48e04c35cd6b85d4707a5b7f7356d305bf8c
Expand Down Expand Up @@ -406,6 +394,12 @@ GEM
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
paperclip (5.0.0.beta1)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
paperclip-optimizer (2.0.0)
image_optim (~> 0.19)
paperclip (>= 3.4)
Expand Down Expand Up @@ -641,7 +635,7 @@ DEPENDENCIES
ng-rails-csrf (~> 0.1.0)
ngannotate-rails!
nokogiri
paperclip!
paperclip (~> 5.0.0.beta1)
paperclip-optimizer (~> 2.0)
paranoia (~> 2.1)
pg (~> 0.18.4)
Expand Down

0 comments on commit 5ddace5

Please sign in to comment.