Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump paperclip from 4.3.7 to 5.2.0 #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ gem 'carmen'
gem 'carmen-rails', '~> 1.0.0'
gem 'geocoder'
gem 'fancybox2-rails', '~> 0.2.8'
gem "paperclip", "~> 4.2"
gem "paperclip", "~> 5.2"
gem 'aws-sdk', '< 2.0'
gem "cocoon"

group :development, :test do
gem 'spring'
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.11'
end

group :development do
Expand Down
116 changes: 56 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ GEM
aws-sdk-v1 (1.67.0)
json (~> 1.4)
nokogiri (~> 1)
bcrypt (3.1.12)
builder (3.2.3)
bcrypt (3.1.16)
builder (3.2.4)
carmen (1.0.2)
activesupport (>= 3.0.0)
carmen-rails (1.0.1)
Expand All @@ -51,39 +51,39 @@ GEM
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.12)
coderay (1.1.2)
cocoon (1.2.15)
coderay (1.1.3)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.4)
crass (1.0.4)
devise (4.5.0)
concurrent-ruby (1.1.7)
crass (1.0.6)
devise (4.7.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
em-websocket (0.5.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.7.0)
fancybox2-rails (0.2.8)
railties (>= 3.1.0, < 5.0)
ffi (1.10.0)
figaro (1.1.1)
thor (~> 0.14)
ffi (1.13.1)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
formatador (0.2.5)
geocoder (1.5.0)
geocoder (1.6.4)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
guard (2.16.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
Expand All @@ -105,52 +105,50 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.8.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
kgio (2.11.2)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
kgio (2.11.3)
listen (3.3.2)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.8.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
lumberjack (1.2.8)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mime-types (3.2.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.0)
mini_mime (1.0.1)
mime-types-data (3.2020.1104)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
minitest (5.14.2)
multi_json (1.15.0)
nenv (0.3.0)
nokogiri (1.10.1)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
paperclip (4.3.7)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
paperclip (5.2.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
mimemagic (~> 0.3.0)
pg (0.21.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
rack (1.6.11)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11)
Expand All @@ -170,8 +168,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand All @@ -182,19 +180,18 @@ GEM
activesupport (= 4.2.11)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
raindrops (0.19.1)
rake (13.0.1)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rb-readline (0.5.5)
rdoc (4.3.0)
recaptcha (5.5.0)
recaptcha (5.6.0)
json
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
ruby_dep (1.5.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
Expand All @@ -205,8 +202,7 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shellany (0.0.1)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.1)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -217,14 +213,14 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.13)
thor (0.20.3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (1.4.1)
tzinfo (1.2.5)
tzinfo (1.2.8)
thread_safe (~> 0.1)
uglifier (4.1.20)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicorn (5.4.1)
unicorn (5.7.0)
kgio (~> 2.6)
raindrops (~> 0.7)
warden (1.2.7)
Expand All @@ -247,7 +243,7 @@ DEPENDENCIES
guard-minitest
jbuilder (~> 2.0)
jquery-rails
paperclip (~> 4.2)
paperclip (~> 5.2)
pg (~> 0.15)
rails (= 4.2.11)
rails_12factor
Expand All @@ -256,7 +252,7 @@ DEPENDENCIES
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
spring
sqlite3
sqlite3 (~> 1.3.11)
uglifier (>= 1.3.0)
unicorn

Expand Down