Make #commit_with_hooks return the new obj id plus some other fixes.

1 files changed, 14 insertions, 4 deletions

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index fb7c6afe77e..172ac52c396 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -123,14 +123,16 @@ module CommitsHelper
     )
   end
 
-  def revert_commit_link(continue_to_path, btn_class: nil)
+  def revert_commit_link(commit, continue_to_path, btn_class: nil)
     return unless current_user
 
+    tooltip = "Revert this #{revert_commit_type(commit)} in a new merge request"
+
     if can_collaborate_with_project?
       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}"
+        link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', 'data-original-title' => tooltip, class: "btn btn-close btn-#{btn_class}"
       end
-    else
+    elsif can?(current_user, :fork_project, @project)
       continue_params = {
         to: continue_to_path,
         notice: edit_in_new_fork_notice + ' Try to revert this commit again.',
@@ -140,7 +142,15 @@ module CommitsHelper
         namespace_key: current_user.namespace.id,
         continue: continue_params)
 
-      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-original-title' => 'Create merge request to revert commit'
+      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-original-title' => tooltip
+    end
+  end
+
+  def revert_commit_type(commit)
+    if commit.merged_merge_request
+      'merge request'
+    else
+      'commit'
     end
   end