Skip to content

Commit

Permalink
Merge pull request consuldemocracy#2393 from consul/paperclip_upgrade
Browse files Browse the repository at this point in the history
Upgrade Paperclip to 5.2.1 for security reasons
  • Loading branch information
bertocq committed Jan 29, 2018
2 parents 596e02c + 2206f3c commit b1a2fba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix social images meta tags https://github.com/consul/consul/pull/1124

### Security
- Upgraded Paperclip version up to 5.2.1 to fix security problem https://github.com/consul/consul/pull/2393

## [0.12.0](https://github.com/consul/consul/compare/v0.11...v0.12) - 2018-01-03

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ gem 'omniauth', '~> 1.8.1'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'omniauth-twitter', '~> 1.4.0'
gem 'paperclip', '~> 5.1.0'
gem 'paperclip', '~> 5.2.1'
gem 'paranoia', '~> 2.4.0'
gem 'pg', '~> 0.21.0'
gem 'pg_search', '~> 2.0.1'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ GEM
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0)
paperclip (5.1.0)
paperclip (5.2.1)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
Expand Down Expand Up @@ -539,7 +539,7 @@ DEPENDENCIES
omniauth-facebook (~> 4.0.0)
omniauth-google-oauth2 (~> 0.4.0)
omniauth-twitter (~> 1.4.0)
paperclip (~> 5.1.0)
paperclip (~> 5.2.1)
paranoia (~> 2.4.0)
pg (~> 0.21.0)
pg_search (~> 2.0.1)
Expand Down

0 comments on commit b1a2fba

Please sign in to comment.