fixed conflicts

2015-07-05 13:24:09 +02:00
parent f5664dee88 94be4b0fbd
commit 96a2fba535
4 changed files with 21 additions and 8 deletions
--- a/front-api/app.rb
+++ b/front-api/app.rb
@@ -16,7 +16,8 @@ before do
  content_type :json
  # TODO: before running to production change this so that only specific
  #       domain is allowed
-  headers 'Access-Control-Allow-Origin' => 'http://192.168.1.35:3001',
+
+  headers 'Access-Control-Allow-Origin' => 'http://localhost:3001',
    'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST','PUT'],
    'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept',
    'Access-Control-Expose-Headers' => 'X-Total-Count',