nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5403 from pravi/bump_rack-protection

Browse source 
bump sinatra to 1.4.5 and rack-protection to 1.4
This commit is contained in:
Jonne Haß 2014-11-29 16:17:18 +01:00
commit c0aa5565cc
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -73,6 +73,7 @@ This is disabled by default since it requires the installation of additional pac
* Hidden overflow for long names on tag pages [#5279](https://github.com/diaspora/diaspora/pull/5279) * Hidden overflow for long names on tag pages [#5279](https://github.com/diaspora/diaspora/pull/5279)
* Always reshare absolute root of a post [#5276](https://github.com/diaspora/diaspora/pull/5276) * Always reshare absolute root of a post [#5276](https://github.com/diaspora/diaspora/pull/5276)
* Convert remaining SASS stylesheets to SCSS [#5342](https://github.com/diaspora/diaspora/pull/5342) * Convert remaining SASS stylesheets to SCSS [#5342](https://github.com/diaspora/diaspora/pull/5342)
* Update rack-protection [#5403](https://github.com/diaspora/diaspora/pull/5403
## Bug fixes ## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

2
Gemfile
View file

@ -182,7 +182,7 @@ group :production do # we don't install these on travis to speed up test runs
# Click-jacking protection # Click-jacking protection
gem 'rack-protection', '1.2' gem 'rack-protection', '1.5.2'
# Process management # Process management

4
Gemfile.lock
View file

@ -394,7 +394,7 @@ GEM
rack-pjax (0.8.0) rack-pjax (0.8.0)
nokogiri (~> 1.5) nokogiri (~> 1.5)
rack (~> 1.1) rack (~> 1.1)
rack-protection (1.2.0) rack-protection (1.5.2)
rack rack
rack-rewrite (1.5.0) rack-rewrite (1.5.0)
rack-ssl (1.4.1) rack-ssl (1.4.1)
@ -658,7 +658,7 @@ DEPENDENCIES
rack-cors (= 0.2.9) rack-cors (= 0.2.9)
rack-google-analytics (= 1.2.0) rack-google-analytics (= 1.2.0)
rack-piwik (= 0.3.0) rack-piwik (= 0.3.0)
rack-protection (= 1.2) rack-protection (= 1.5.2)
rack-rewrite (= 1.5.0) rack-rewrite (= 1.5.0)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.1.8) rails (= 4.1.8)