Skip to content
Snippets Groups Projects
Commit 95e6327b authored by Josh Frye's avatar Josh Frye Committed by Josh Frye
Browse files

Fix tests

parent 8bfc4645
No related branches found
No related tags found
1 merge request!2300Show 'New Merge Request' buttons on canonical repo. (by @joshfng)
Loading
Loading
@@ -8,7 +8,7 @@
= link_to url_for_new_issue(@project, only_path: true) do
= icon('exclamation-circle fw')
New issue
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : current_user.fork_of(@project)
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
- if merge_project
%li
= link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@
.controls
= render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
 
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : current_user.fork_of(@project)
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
- if merge_project
.pull-left.hidden-xs
= link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment