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
25bf63c8
Commit
25bf63c8
authored
Jun 09, 2020
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure we always generate a valid URL
Defaults to the homepage, if for some reason the canonical URL is nil
parent
af7eff8f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+1
-1
changelogs/unreleased/ajk-safe-wiki-event-url.yml
changelogs/unreleased/ajk-safe-wiki-event-url.yml
+5
-0
No files found.
app/helpers/events_helper.rb
View file @
25bf63c8
...
...
@@ -188,7 +188,7 @@ module EventsHelper
end
def
event_wiki_page_target_url
(
event
)
project_wiki_url
(
event
.
project
,
event
.
target
.
canonical_slug
)
project_wiki_url
(
event
.
project
,
event
.
target
&
.
canonical_slug
||
Wiki
::
HOMEPAGE
)
end
def
event_note_title_html
(
event
)
...
...
changelogs/unreleased/ajk-safe-wiki-event-url.yml
0 → 100644
View file @
25bf63c8
---
title
:
Ensure we always generate a valid wiki event URL
merge_request
:
34191
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