Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
14032b8a
Commit
14032b8a
authored
May 17, 2018
by
Francisco Javier López
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed badge api endpoint route when relative_url is set
parent
bf806712
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/controllers/groups/settings/badges_controller.rb
app/controllers/groups/settings/badges_controller.rb
+2
-2
app/controllers/projects/settings/badges_controller.rb
app/controllers/projects/settings/badges_controller.rb
+2
-2
changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml
...-46411-fix-badge-api-endpoint-route-with-relative-url.yml
+5
-0
No files found.
app/controllers/groups/settings/badges_controller.rb
View file @
14032b8a
module
Groups
module
Groups
module
Settings
module
Settings
class
BadgesController
<
Groups
::
ApplicationController
class
BadgesController
<
Groups
::
ApplicationController
include
GrapeRouteHelpers
::
NamedRouteMatcher
include
API
::
Helpers
::
RelatedResourcesHelpers
before_action
:authorize_admin_group!
before_action
:authorize_admin_group!
def
index
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
end
end
end
...
...
app/controllers/projects/settings/badges_controller.rb
View file @
14032b8a
module
Projects
module
Projects
module
Settings
module
Settings
class
BadgesController
<
Projects
::
ApplicationController
class
BadgesController
<
Projects
::
ApplicationController
include
GrapeRouteHelpers
::
NamedRouteMatcher
include
API
::
Helpers
::
RelatedResourcesHelpers
before_action
:authorize_admin_project!
before_action
:authorize_admin_project!
def
index
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
end
end
end
...
...
changelogs/unreleased/fj-46411-fix-badge-api-endpoint-route-with-relative-url.yml
0 → 100644
View file @
14032b8a
---
title
:
Fixed badge api endpoint route when relative url is set
merge_request
:
19004
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment