diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-06-19 09:00:27 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-06-19 09:00:27 +0100 |
| commit | 0af9659b9444c230e89a4d1798547354a3768bdc (patch) | |
| tree | 202a04120cd0b0394cd4f19dbd36935f6479aec2 | |
| parent | e74a0a818a976180e55e13392633a7ec4bdaca7c (diff) | |
| parent | 93fdad62a6b6cdcb6769b7fefa45d1bada46fb8f (diff) | |
Merge branch 'upgrade-rack' into develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ gem 'memcache-client', '~> 1.8.5' gem 'net-http-local', '~> 0.1.2', :platforms => [:ruby_18, :ruby_19] gem 'net-purge', '~> 0.1.0' gem 'open4', '~> 1.3.4' -gem 'rack', '~> 1.4.5' +gem 'rack', '~> 1.4.6' if RUBY_VERSION.to_f >= 1.9 gem 'rack-utf8_sanitizer', '~> 1.3.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 33fc22b28..9cd1e6adb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM slop (~> 3.4) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.4.5) + rack (1.4.6) rack-cache (1.2) rack (>= 0.4) rack-protection (1.5.0) @@ -343,7 +343,7 @@ DEPENDENCIES pg (~> 0.17.1) pry (~> 0.9.6) quiet_assets (~> 1.0.2) - rack (~> 1.4.5) + rack (~> 1.4.6) rack-utf8_sanitizer (~> 1.3.0) rails (= 3.2.21) rails-i18n (~> 0.7.3) |