Merge pull request #5403 from pravi/bump_rack-protection

bump sinatra to 1.4.5 and rack-protection to 1.4

Changelog.md

@@ -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)
 * 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)
+* Update rack-protection [#5403](https://github.com/diaspora/diaspora/pull/5403
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

Gemfile

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

Gemfile.lock

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