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.

Sign up for GitHub

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

Jump to bottom

Bump paperclip from 4.2.4 to 5.2.0 #932

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump paperclip from 4.2.4 to 5.2.0 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gem 'responders', '~> 2.0'
gem "jbuilder"
gem 'jwt'
gem 'rubyXL'
gem 'paperclip', '~> 4.2.0'
gem 'paperclip', '~> 5.2.0'
gem "pg"
gem "pry"
# Needed for a smooth upgrade from Rails 3.2 to Rails 4.0
Expand Down
37 changes: 24 additions & 13 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ GEM
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activerecord-postgis-adapter (3.1.5)
activerecord (~> 4.2)
rgeo-activerecord (>= 4.0.4)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
Expand All @@ -66,7 +69,7 @@ GEM
debug_inspector (>= 0.0.1)
bootstrap3-datetimepicker-rails (4.17.47)
momentjs-rails (>= 2.8.1)
builder (3.2.2)
builder (3.2.3)
byebug (11.0.1)
cancan (1.6.10)
capybara (2.4.4)
Expand All @@ -77,10 +80,9 @@ GEM
xpath (~> 2.0)
celluloid (0.16.0)
timers (~> 4.0.0)
climate_control (0.0.3)
activesupport (>= 3.0)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.7)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coffee-rails (4.1.0)
Expand All @@ -90,6 +92,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
concurrent-ruby (1.1.5)
connection_pool (2.2.0)
dalli (2.7.4)
database_cleaner (1.4.1)
Expand Down Expand Up @@ -133,15 +136,16 @@ GEM
heapy (0.1.3)
hitimes (1.2.2)
http_accept_language (2.0.5)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (1.8.6)
jwt (1.4.1)
kgio (2.9.3)
launchy (2.4.3)
Expand All @@ -157,9 +161,10 @@ GEM
memcachier (0.0.2)
memory_profiler (0.9.10)
method_source (0.8.2)
mime-types (2.6.1)
mime-types (2.99.3)
mimemagic (0.3.3)
mini_portile (0.6.2)
minitest (5.8.0)
minitest (5.11.3)
momentjs-rails (2.20.1)
railties (>= 3.1)
multi_json (1.11.2)
Expand All @@ -170,11 +175,12 @@ GEM
notiffany (0.0.7)
nenv (~> 0.1)
shellany (~> 0.0)
paperclip (4.2.4)
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)
pg (0.18.2)
poltergeist (1.6.0)
capybara (~> 2.1)
Expand Down Expand Up @@ -245,6 +251,10 @@ GEM
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rgeo (0.6.0)
rgeo-activerecord (4.0.5)
activerecord (~> 4.2)
rgeo (~> 0.3)
rollbar (2.2.1)
roo (2.1.1)
nokogiri (~> 1)
Expand Down Expand Up @@ -303,7 +313,7 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.7.3)
timers (4.0.1)
Expand All @@ -329,6 +339,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord-postgis-adapter (~> 3.1.5)
analytics-ruby (~> 2.0.8)
angularjs-rails (~> 1.4.8)
aws-sdk (< 2.0)
Expand Down Expand Up @@ -358,7 +369,7 @@ DEPENDENCIES
memcachier
momentjs-rails
newrelic_rpm
paperclip (~> 4.2.0)
paperclip (~> 5.2.0)
pg
poltergeist
protected_attributes
Expand Down