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
3514a0bf
Commit
3514a0bf
authored
Nov 27, 2019
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a display bug in the fork removal description message
parent
f325035b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+3
-1
changelogs/unreleased/fix-fork-link-display-bug.yml
changelogs/unreleased/fix-fork-link-display-bug.yml
+5
-0
spec/views/projects/edit.html.haml_spec.rb
spec/views/projects/edit.html.haml_spec.rb
+2
-1
No files found.
app/helpers/projects_helper.rb
View file @
3514a0bf
...
...
@@ -114,8 +114,10 @@ module ProjectsHelper
source
=
visible_fork_source
(
project
)
if
source
_
(
'This will remove the fork relationship between this project and %{fork_source}.'
)
%
msg
=
_
(
'This will remove the fork relationship between this project and %{fork_source}.'
)
%
{
fork_source:
link_to
(
source
.
full_name
,
project_path
(
source
))
}
msg
.
html_safe
else
_
(
'This will remove the fork relationship between this project and other projects in the fork network.'
)
end
...
...
changelogs/unreleased/fix-fork-link-display-bug.yml
0 → 100644
View file @
3514a0bf
---
title
:
Fix a display bug in the fork removal description message
merge_request
:
20843
author
:
type
:
fixed
spec/views/projects/edit.html.haml_spec.rb
View file @
3514a0bf
...
...
@@ -53,6 +53,7 @@ describe 'projects/edit' do
render
expect
(
rendered
).
to
have_content
(
'Remove fork relationship'
)
expect
(
rendered
).
to
have_link
(
source_project
.
full_name
,
href:
project_path
(
source_project
))
end
it
'hides the fork relationship settings from an unauthorized user'
do
...
...
@@ -78,7 +79,7 @@ describe 'projects/edit' do
render
expect
(
rendered
).
to
have_content
(
'Remove fork relationship'
)
expect
(
rendered
).
to
have_
content
(
source_project
.
full_name
)
expect
(
rendered
).
to
have_
link
(
source_project
.
full_name
,
href:
project_path
(
source_project
)
)
end
end
end
...
...
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