Merge branch 'develop'

2025-01-24 15:26:38 -06:00 · 2016-08-21 21:24:31 +02:00 · 2016-08-21 21:24:31 +02:00 · 6eef694315
commit 6eef694315
parent c1c325588e fe4a4aef34
2 changed files with 7 additions and 1 deletions
--- 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**
--- a/module/Rest/config/middleware-pipeline.config.php
+++ b/module/Rest/config/middleware-pipeline.config.php
@ -7,9 +7,9 @@ return [
        'rest' => [
            'path' => '/rest',
            'middleware' => [
+                Middleware\CrossDomainMiddleware::class,
                Middleware\BodyParserMiddleware::class,
                Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
            ],
            'priority' => 5,
        ],