summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-07 22:08:30 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-10-07 22:08:30 -0400
commitf9744ea9a42f206f00b16fd7866540bb9edcd93c (patch)
treecdd2269b0a624c595cab19659f941e40c0eddd72
parentc670f0736648a4dbd558d2f41eea33f773dee3a6 (diff)
downloadgitlab-ce-f9744ea9a42f206f00b16fd7866540bb9edcd93c.tar.gz
Update rack-cors to ~> 0.4.0
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock4
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 26ffb8c4b36..05306374f10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,9 +65,9 @@ gem 'gollum-lib', '~> 4.0.2'
gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
# API
-gem "grape", "~> 0.6.1"
-gem "grape-entity", "~> 0.4.2"
-gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
+gem 'grape', '~> 0.6.1'
+gem 'grape-entity', '~> 0.4.2'
+gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Format dates and times
# based on human-friendly examples
diff --git a/Gemfile.lock b/Gemfile.lock
index fc9244304a3..5336f4bf957 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -496,7 +496,7 @@ GEM
rack (>= 0.4)
rack-attack (4.3.0)
rack
- rack-cors (0.2.9)
+ rack-cors (0.4.0)
rack-mini-profiler (0.9.7)
rack (>= 1.1.3)
rack-mount (0.8.3)
@@ -883,7 +883,7 @@ DEPENDENCIES
pry-rails
quiet_assets (~> 1.0.2)
rack-attack (~> 4.3.0)
- rack-cors (~> 0.2.9)
+ rack-cors (~> 0.4.0)
rack-mini-profiler (~> 0.9.0)
rack-oauth2 (~> 1.0.5)
rails (= 4.1.12)