Commit 71d0ef5b authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'fix_divider_in_dropdown_when_not_needed' into 'master'

Fix divider in dropdown when not needed

closes #14533
## Before
![Screen_Shot_2016-03-25_at_12.35.21_AM](/uploads/20f386c9c45c9ee8716835ccfa0066ed/Screen_Shot_2016-03-25_at_12.35.21_AM.png)

## After
![Screen_Shot_2016-03-25_at_12.37.27_AM](/uploads/22db62db920017da5fe1da7670fbbb0e/Screen_Shot_2016-03-25_at_12.37.27_AM.png)

See merge request !3394
parents de1c8164 e67ce6cd
...@@ -3,25 +3,32 @@ ...@@ -3,25 +3,32 @@
%a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"} %a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
= icon('plus') = icon('plus')
%ul.dropdown-menu.dropdown-menu-right.project-home-dropdown %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
- if can?(current_user, :create_issue, @project) - can_create_issue = can?(current_user, :create_issue, @project)
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
- can_create_snippet = can?(current_user, :create_snippet, @project)
- if can_create_issue
%li %li
= 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 && 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
= icon('tasks fw') = icon('tasks fw')
New merge request New merge request
- if can?(current_user, :create_snippet, @project)
- if can_create_snippet
%li %li
= link_to new_namespace_project_snippet_path(@project.namespace, @project) do = link_to new_namespace_project_snippet_path(@project.namespace, @project) do
= icon('file-text-o fw') = icon('file-text-o fw')
New snippet New snippet
- if can?(current_user, :push_code, @project) - if can_create_issue || merge_project || can_create_snippet
%li.divider %li.divider
- if can?(current_user, :push_code, @project)
%li %li
= link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do = link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do
= icon('file fw') = icon('file fw')
...@@ -35,13 +42,11 @@ ...@@ -35,13 +42,11 @@
= icon('tags fw') = icon('tags fw')
New tag New tag
- elsif current_user && current_user.already_forked?(@project) - elsif current_user && current_user.already_forked?(@project)
%li.divider
%li %li
= link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do = link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do
= icon('file fw') = icon('file fw')
New file New file
- elsif can?(current_user, :fork_project, @project) - elsif can?(current_user, :fork_project, @project)
%li.divider
%li %li
- continue_params = { to: namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master'), - continue_params = { to: namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master'),
notice: edit_in_new_fork_notice, notice: edit_in_new_fork_notice,
......
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