diff options
| author | Josh Frye <joshfng@mbp.local> | 2015-12-23 12:24:25 -0500 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-01-03 18:12:27 -0500 |
| commit | 95e6327b85b8230dc834c781203c72b318551b5d (patch) | |
| tree | b659aba6885675ac485ac0b6a29e013b9897e61e /app/views/projects/buttons | |
| parent | 8bfc46451eae5bd92380b9fbdf91b9636d55066c (diff) | |
| download | gitlab-ce-95e6327b85b8230dc834c781203c72b318551b5d.tar.gz | |
Fix tests
Diffstat (limited to 'app/views/projects/buttons')
| -rw-r--r-- | app/views/projects/buttons/_dropdown.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml index 459e6da2fe2..35a9d3223a6 100644 --- a/app/views/projects/buttons/_dropdown.html.haml +++ b/app/views/projects/buttons/_dropdown.html.haml @@ -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 |