Skip to content

Commit

Permalink
Merge pull request #44 from publiclab/cors
Browse files Browse the repository at this point in the history
cors!
  • Loading branch information
jywarren authored May 30, 2019
2 parents 34b13d6 + 88f30e7 commit 019548f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@


gem "sinatra"
gem "sinatra-cors"
gem "nokogiri"

gem "fog-google"
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEM
rack (~> 2.0)
rack-protection (= 2.0.5)
tilt (~> 2.0)
sinatra-cors (1.1.0)
tilt (2.0.9)
uber (0.1.0)

Expand All @@ -106,6 +107,7 @@ DEPENDENCIES
rack-test
rspec
sinatra
sinatra-cors

BUNDLED WITH
1.17.3
7 changes: 7 additions & 0 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@

require "mapknitterExporter"
require "sinatra"
require "sinatra/cors"

set :allow_origin, "*"
set :allow_methods, "GET,HEAD,POST"
set :allow_headers, "content-type,if-modified-since"
set :expose_headers, "location,link"

require "json"
require "yaml"
require "erb"
Expand Down

0 comments on commit 019548f

Please sign in to comment.