Commit 95e6327b authored by Josh Frye's avatar Josh Frye Committed by Josh Frye

Fix tests

parent 8bfc4645
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= link_to url_for_new_issue(@project, only_path: true) do = link_to url_for_new_issue(@project, only_path: true) do
= icon('exclamation-circle fw') = icon('exclamation-circle fw')
New issue 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 - if merge_project
%li %li
= link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.controls .controls
= render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project) = 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 - if merge_project
.pull-left.hidden-xs .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 = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment