diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:23:14 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:23:14 +0000 |
commit | 093856a75ed4a354286f7e6fc7a0f08d9d95a431 (patch) | |
tree | 0c008a6dd0409492d5ac8d333c148a66ee3714a1 | |
parent | b82c4f1b33169e57b3237e61d600d5022482cdd1 (diff) | |
parent | 1704dc9720f30fa71a383b24b236893460a76226 (diff) | |
download | gitlab-ce-093856a75ed4a354286f7e6fc7a0f08d9d95a431.tar.gz |
Merge branch '41921-follow-up-fixes' into 'master'
Refactor of buttons _dropdown partial
Closes #41921
See merge request gitlab-org/gitlab-ce!16486
-rw-r--r-- | app/views/projects/buttons/_dropdown.html.haml | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml index 8e8c911185a..a94d9c14722 100644 --- a/app/views/projects/buttons/_dropdown.html.haml +++ b/app/views/projects/buttons/_dropdown.html.haml @@ -10,37 +10,28 @@ - if can_create_issue %li - = link_to new_project_issue_path(@project) do - #{ _('New issue') } - + = link_to _('New issue'), new_project_issue_path(@project) - if merge_project %li - = link_to project_new_merge_request_path(merge_project) do - #{ _('New merge request') } - + = link_to _('New merge request'), project_new_merge_request_path(merge_project) - if can_create_snippet %li - = link_to new_project_snippet_path(@project) do - #{ _('New snippet') } + = link_to _('New snippet'), new_project_snippet_path(@project) - if can_create_issue || merge_project || can_create_snippet %li.divider - if can?(current_user, :push_code, @project) %li - = link_to project_new_blob_path(@project, @project.default_branch || 'master') do - #{ _('New file') } + = link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master') - unless @project.empty_repo? %li - = link_to new_project_branch_path(@project) do - #{ _('New branch') } + = link_to _('New branch'), new_project_branch_path(@project) %li - = link_to new_project_tag_path(@project) do - #{ _('New tag') } + = link_to _('New tag'), new_project_tag_path(@project) - elsif current_user && current_user.already_forked?(@project) %li - = link_to project_new_blob_path(@project, @project.default_branch || 'master') do - #{ _('New file') } + = link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master') - elsif can?(current_user, :fork_project, @project) %li - continue_params = { to: project_new_blob_path(@project, @project.default_branch || 'master'), @@ -48,5 +39,4 @@ notice_now: edit_in_new_fork_notice_now } - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params) - = link_to fork_path, method: :post do - #{ _('New file') } + = link_to _('New file'), fork_path, method: :post |