Download as
Browse Code »

Commit 68d9538170b03ce3f79093216d86964f6809fe6b

Authored by Dmitriy Zaporozhets
2 parents a2efc277 6edb4c06
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhq

Showing 3 changed files with 11 additions and 0 deletions   Show diff stats
Gemfile
  Diff comments   View file @68d9538
... ... @@ -44,6 +44,7 @@ gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
44 44 # API
45 45 gem "grape", "~> 0.4.1"
46 46 gem "grape-entity", "~> 0.3.0"
  47 +gem 'rack-cors', require: 'rack/cors'
47 48  
48 49 # Format dates and times
49 50 # based on human-friendly examples
... ...
Gemfile.lock
  Diff comments   View file @68d9538
... ... @@ -335,6 +335,7 @@ GEM
335 335 rack
336 336 rack-cache (1.2)
337 337 rack (>= 0.4)
  338 + rack-cors (0.2.9)
338 339 rack-mini-profiler (0.1.31)
339 340 rack (>= 1.1.3)
340 341 rack-mount (0.8.3)
... ... @@ -610,6 +611,7 @@ DEPENDENCIES
610 611 pry
611 612 quiet_assets (~> 1.0.1)
612 613 rack-attack
  614 + rack-cors
613 615 rack-mini-profiler
614 616 rails (= 3.2.16)
615 617 rails-dev-tweaks
... ...
config/application.rb
  Diff comments   View file @68d9538
... ... @@ -79,5 +79,13 @@ module Gitlab
79 79 # config.relative_url_root = "/gitlab"
80 80  
81 81 config.middleware.use Rack::Attack
  82 +
  83 + # Allow access to GitLab API from other domains
  84 + config.middleware.use Rack::Cors do
  85 + allow do
  86 + origins '*'
  87 + resource '/api/*', headers: :any, methods: [:get, :post, :options, :put]
  88 + end
  89 + end
82 90 end
83 91 end
... ...