diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 17cf4ddcdc0..78e99202a27 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -127,12 +127,10 @@ module CommitsHelper return unless current_user if show_modal_condition - link_to('Revert', '#modal-revert-commit', - 'data-target' => '#modal-revert-commit', - 'data-toggle' => 'modal', - class: "btn btn-close btn-#{btn_class}", - title: 'Create merge request to revert commit' - ) + content_tag :span, 'data-toggle' => 'modal', 'data-target' => '#modal-revert-commit' do + link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', + 'data-original-title' => 'Create merge request to revert commit', class: "btn btn-close btn-#{btn_class}" + end else continue_params = { to: continue_to_path, @@ -145,7 +143,7 @@ module CommitsHelper ) link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, - title: 'Create merge request to revert commit' + 'data-toggle' => 'tooltip', 'data-original-title' => 'Create merge request to revert commit' end end diff --git a/app/views/projects/commit/_revert.html.haml b/app/views/projects/commit/_revert.html.haml index 38ff21f0c0e..ef1aced495a 100644 --- a/app/views/projects/commit/_revert.html.haml +++ b/app/views/projects/commit/_revert.html.haml @@ -7,7 +7,7 @@ .modal-body = form_tag revert_namespace_project_commit_path(@project.namespace, @project, commit_id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-requires-input' do .form-group.branch - = label_tag 'target_branch', 'Target branch', class: 'control-label' + = label_tag 'target_branch', 'Revert in branch:', class: 'control-label' .col-sm-10 = select_tag "target_branch", grouped_options_refs, class: "select2 select2-sm js-target-branch" - if can?(current_user, :push_code, @project)