diff --git a/Gemfile b/Gemfile index 205d9044f3f78006023d5e0e6d8ca870518fa7b4..416742af69bc0ff318ba9540fe6820c73f9842db 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 56466ad95c00e8868c66783919a02d095b6b04c7..e46205d4a19891a1923141e0b495ec7ac3602edc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -502,7 +502,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) @@ -889,7 +889,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) diff --git a/config/application.rb b/config/application.rb index a96e22211e640a4b826552cd9ce4d61a46ff4885..bfa2a809dd7d7fd472990b00d6f38c8948fd36ce 100644 --- a/config/application.rb +++ b/config/application.rb @@ -74,7 +74,7 @@ module Gitlab origins '*' resource '/api/*', headers: :any, - methods: [:get, :post, :options, :put, :delete], + methods: :any, expose: ['Link'] end end