Fix tests
This commit is contained in:
parent
8bfc46451e
commit
95e6327b85
2 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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…
Reference in a new issue