diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-06-15 12:27:40 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-06-15 14:47:05 +0200 |
| commit | 11c957f5e5c2e35c11e81c6ab0c639eaa547b3e9 (patch) | |
| tree | 97c8100cb25126d8513ede9599b87e3291a21e12 | |
| parent | ecc098c92ac85d033fa5678467398dba8821e99d (diff) | |
| download | gitlab-ce-11c957f5e5c2e35c11e81c6ab0c639eaa547b3e9.tar.gz | |
`merge request` instead of `merge-request`
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index 663cd065b28..ae33b57524f 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -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 |