From 477ae66b4ddd3ace948f47c7bfa60085d6e320ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Wed, 10 Feb 2016 17:02:47 -0500 Subject: [PATCH] Move revert link to the MR widget section plus some refactor. --- app/helpers/commits_helper.rb | 4 ++-- app/views/projects/merge_requests/show/_mr_title.html.haml | 3 --- app/views/projects/merge_requests/widget/_merged.html.haml | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index d5b1feed931..17cf4ddcdc0 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -123,14 +123,14 @@ module CommitsHelper ) end - def revert_commit_link(show_modal_condition, continue_to_path) + def revert_commit_link(show_modal_condition, continue_to_path, btn_class: nil) 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-grouped btn-close', + class: "btn btn-close btn-#{btn_class}", title: 'Create merge request to revert commit' ) else diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 32c9b19d8c2..7320ff0ccc1 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -18,6 +18,3 @@ Edit - if @merge_request.closed? = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: "Reopen merge request" - - - if @merge_request.merged? && @merge_request.merge_commit_sha.present? - = revert_commit_link(can_update_merge_request?, namespace_project_merge_request_path(@project.namespace, @project, @merge_request)) diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml index d1d602eecdc..2add37387ad 100644 --- a/app/views/projects/merge_requests/widget/_merged.html.haml +++ b/app/views/projects/merge_requests/widget/_merged.html.haml @@ -6,6 +6,8 @@ - if @merge_request.merge_event by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)} #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} + - if @merge_request.merge_commit_sha.present? + = revert_commit_link(can_update_merge_request?, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: 'sm') %div - if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true') The changes were merged into