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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
11c957f5
Commit
11c957f5
authored
Jun 15, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`merge request` instead of `merge-request`
parent
ecc098c9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+2
-2
No files found.
app/views/projects/commit/_change.html.haml
View file @
11c957f5
...
...
@@ -2,13 +2,13 @@
-
when
'revert'
-
label
=
n_
(
'ChangeTypeAction|Revert'
)
-
branch_label
=
s_
(
'ChangeTypeActionLabel|Revert in branch'
)
-
revert_merge_request
=
_
(
'Revert this merge
-
request'
)
-
revert_merge_request
=
_
(
'Revert this merge
request'
)
-
revert_commit
=
_
(
'Revert this commit'
)
-
title
=
commit
.
merged_merge_request
(
current_user
)
?
revert_merge_request
:
revert_commit
-
when
'cherry-pick'
-
label
=
s_
(
'ChangeTypeAction|Cherry-pick'
)
-
branch_label
=
s_
(
'ChangeTypeActionLabel|Pick into branch'
)
-
title
=
commit
.
merged_merge_request
(
current_user
)
?
_
(
'Cherry-pick this merge
-
request'
)
:
_
(
'Cherry-pick this commit'
)
-
title
=
commit
.
merged_merge_request
(
current_user
)
?
_
(
'Cherry-pick this merge
request'
)
:
_
(
'Cherry-pick this commit'
)
.modal
{
id:
"modal-#{type}-commit"
}
.modal-dialog
...
...
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