Some updates after last code review.

3 files changed, 24 insertions, 9 deletions

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index aeb4bcabc7d..b37bdaf5f07 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -123,11 +123,28 @@ module CommitsHelper
     )
   end
 
-  def can_collaborate_with_project?(project = nil)
-    project ||= @project
-
-    can?(current_user, :push_code, project) ||
-      (current_user && current_user.already_forked?(project))
+  def revert_commit_link(show_modal_condition, continue_to_path)
+    if show_modal_condition
+      link_to('Revert', '#modal-revert-commit',
+        'data-target' => '#modal-revert-commit',
+        'data-toggle' => 'modal',
+        class: 'btn btn-grouped btn-close',
+        title: 'Create merge request to revert commit'
+      )
+    else
+      continue_params = {
+        to: continue_to_path,
+        notice: edit_in_new_fork_notice + ' Try to revert this commit again.',
+        notice_now: edit_in_new_fork_notice_now
+      }
+      fork_path = namespace_project_forks_path(@project.namespace, @project,
+                    namespace_key: current_user.namespace.id,
+                    continue: continue_params
+                  )
+
+      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post,
+        title: 'Create merge request to revert commit'
+    end
   end
 
   protected
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index b4858b999d5..f5d90b7791d 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -96,7 +96,6 @@ module MergeRequestsHelper
   def can_update_merge_request?
     project ||= @project
 
-    can?(current_user, :update_merge_request, project) ||
-      (current_user && current_user.already_forked?(project))
+    can_collaborate_with_project?(project)
   end
 end
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 2ad7c80dae0..4920ca5af6e 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -56,8 +56,7 @@ module TreeHelper
 
     return false unless on_top_of_branch?(project, ref)
 
-    can?(current_user, :push_code, project) ||
-      (current_user && current_user.already_forked?(project))
+    can_collaborate_with_project?(project)
   end
 
   def tree_edit_branch(project = @project, ref = @ref)