From 11c957f5e5c2e35c11e81c6ab0c639eaa547b3e9 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Thu, 15 Jun 2017 12:27:40 +0200 Subject: `merge request` instead of `merge-request` --- app/views/projects/commit/_change.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/commit') 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 -- cgit v1.2.1