Updated debug value

TryGhost · Dec 3, 2018 · 0d80e39 · 0d80e39
1 parent f155ec4
commit 0d80e39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/core/server/api/v2/utils/serializers/output/configuration.js b/core/server/api/v2/utils/serializers/output/configuration.js
@@ -1,4 +1,4 @@
-const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:mail');
+const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:configuration');
 
 module.exports = {
     all(configuration, apiConfig, frame) {

diff --git a/core/server/web/api/v2/admin/routes.js b/core/server/web/api/v2/admin/routes.js
@@ -22,13 +22,8 @@ module.exports = function apiRoutes() {
     router.options('*', shared.middlewares.api.cors);
 
     // ## Configuration
-<<<<<<< HEAD
-    router.get('/configuration', api.http(api.configuration.read));
-    router.get('/configuration/:key', mw.authAdminApi, api.http(api.configuration.read));
-=======
     router.get('/configuration', apiv2.http(apiv2.configuration.read));
     router.get('/configuration/:key', mw.authAdminAPI, apiv2.http(apiv2.configuration.read));
->>>>>>> Added configuration controller to v2 API
 
     // ## Posts
     router.get('/posts', mw.authAdminApi, apiv2.http(apiv2.posts.browse));