kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

FIxes based on MR

Browse source
This commit is contained in:
Tim Zallmann 2017-06-06 12:02:50 +02:00
parent 1e4fb1f8fd
commit 1707c79d0b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/layouts/header/_new_dropdown.haml
View file

@ -7,7 +7,7 @@
- if @group - if @group
- create_group_project = can?(current_user, :create_projects, @group) - create_group_project = can?(current_user, :create_projects, @group)
- create_group_subgroup = can?(current_user, :create_subgroup, @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 %li.dropdown-bold-header This group
- if create_group_project - if create_group_project
%li %li
@ -18,11 +18,11 @@
%li.divider %li.divider
%li.dropdown-bold-header GitLab %li.dropdown-bold-header GitLab
- if @project && @project.namespace && :project_id - if @project && @project.persisted?
- create_project_issue = can?(current_user, :create_issue, @project) - 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)) - 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) - 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 %li.dropdown-bold-header This project
- if create_project_issue - if create_project_issue
%li %li
@ -34,7 +34,7 @@
%li %li
= link_to 'New snippet', new_namespace_project_snippet_path(@project.namespace, @project) = link_to 'New snippet', new_namespace_project_snippet_path(@project.namespace, @project)
%li.divider %li.divider
%li.dropdown-bold-header GitLab %li.dropdown-bold-header GitLab
- if current_user.can_create_project? - if current_user.can_create_project?
%li %li
= link_to 'New project', new_project_path = link_to 'New project', new_project_path