From 14032b8a85f42c89d86925c47bd3e10270779a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= <fjlopez@gitlab.com>
Date: Thu, 17 May 2018 11:45:59 +0200
Subject: [PATCH] Fixed badge api endpoint route when relative_url is set

---
 app/controllers/groups/settings/badges_controller.rb         | 4 ++--
 app/controllers/projects/settings/badges_controller.rb       | 4 ++--
 ...-46411-fix-badge-api-endpoint-route-with-relative-url.yml | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml

diff --git a/app/controllers/groups/settings/badges_controller.rb b/app/controllers/groups/settings/badges_controller.rb
index edb334a3d88..ccbd0a3bc02 100644
--- a/app/controllers/groups/settings/badges_controller.rb
+++ b/app/controllers/groups/settings/badges_controller.rb
@@ -1,12 +1,12 @@
 module Groups
   module Settings
     class BadgesController < Groups::ApplicationController
-      include GrapeRouteHelpers::NamedRouteMatcher
+      include API::Helpers::RelatedResourcesHelpers
 
       before_action :authorize_admin_group!
 
       def index
-        @badge_api_endpoint = api_v4_groups_badges_path(id: @group.id)
+        @badge_api_endpoint = expose_url(api_v4_groups_badges_path(id: @group.id))
       end
     end
   end
diff --git a/app/controllers/projects/settings/badges_controller.rb b/app/controllers/projects/settings/badges_controller.rb
index f7b70dd4b7b..7887bee49c5 100644
--- a/app/controllers/projects/settings/badges_controller.rb
+++ b/app/controllers/projects/settings/badges_controller.rb
@@ -1,12 +1,12 @@
 module Projects
   module Settings
     class BadgesController < Projects::ApplicationController
-      include GrapeRouteHelpers::NamedRouteMatcher
+      include API::Helpers::RelatedResourcesHelpers
 
       before_action :authorize_admin_project!
 
       def index
-        @badge_api_endpoint = api_v4_projects_badges_path(id: @project.id)
+        @badge_api_endpoint = expose_url(api_v4_projects_badges_path(id: @project.id))
       end
     end
   end
diff --git a/changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml b/changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml
new file mode 100644
index 00000000000..bd4e5a43352
--- /dev/null
+++ b/changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed badge api endpoint route when relative url is set
+merge_request: 19004
+author:
+type: fixed