Merge branch 'develop'

shlinkio · Aug 21, 2016 · 6eef694 · 6eef694
2 parents c1c3255 + fe4a4ae
commit 6eef694
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+### 1.2.1
+
+**Bugs**
+
+* [62: Fix cross-domain requests in REST API](https://github.com/acelaya/url-shortener/issues/62)
+
 ### 1.2.0
 
 **Features**

diff --git a/module/Rest/config/middleware-pipeline.config.php b/module/Rest/config/middleware-pipeline.config.php
@@ -7,9 +7,9 @@
         'rest' => [
             'path' => '/rest',
             'middleware' => [
+                Middleware\CrossDomainMiddleware::class,
                 Middleware\BodyParserMiddleware::class,
                 Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
             ],
             'priority' => 5,
         ],