Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-02-09 22:50:25 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-02-19 21:14:52 +0300
commit328b52d58a36525fdc853f15877f87bcd7832d1c (patch)
tree6215b8b07a008c1b40d128d70331e901c443ea12 /app/helpers/commits_helper.rb
parent38e708f0cea2f6707a26854b9d077182c063dd51 (diff)
Some updates after last code review.
Diffstat (limited to 'app/helpers/commits_helper.rb')
-rw-r--r--app/helpers/commits_helper.rb27
1 files changed, 22 insertions, 5 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