summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-06-06 12:02:50 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-06-06 12:02:50 +0200
commit0917ad7269084ef92a6d1bfc940530fca28303d8 (patch)
treebdd3627f6a835c03613b1245b9919b3215746f4a
parentef5bf2f2e5ff621e15c7ed50831874942264f492 (diff)
downloadgitlab-ce-0917ad7269084ef92a6d1bfc940530fca28303d8.tar.gz
FIxes based on MR
-rw-r--r--app/views/layouts/header/_new_dropdown.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index b220b40d6e3..ecc5a518687 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -7,7 +7,7 @@
- if @group
- create_group_project = can?(current_user, :create_projects, @group)
- create_group_subgroup = can?(current_user, :create_subgroup, @group)
- - if (create_group_project || create_group_subgroup)
+ - if create_group_project || create_group_subgroup
%li.dropdown-bold-header This group
- if create_group_project
%li
@@ -18,11 +18,11 @@
%li.divider
%li.dropdown-bold-header GitLab
- - if @project && @project.namespace && :project_id
+ - if @project && @project.persisted?
- create_project_issue = can?(current_user, :create_issue, @project)
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
- create_project_snippet = can?(current_user, :create_project_snippet, @project)
- - if (create_project_issue || merge_project || create_project_snippet)
+ - if create_project_issue || merge_project || create_project_snippet
%li.dropdown-bold-header This project
- if create_project_issue
%li
@@ -34,7 +34,7 @@
%li
= link_to 'New snippet', new_namespace_project_snippet_path(@project.namespace, @project)
%li.divider
- %li.dropdown-bold-header GitLab
+ %li.dropdown-bold-header GitLab
- if current_user.can_create_project?
%li
= link_to 'New project', new_project_path