diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-17 21:23:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-17 21:23:30 +0000 |
| commit | e7ec1db63c18758e34f983b2f26f3fe7a3a1b631 (patch) | |
| tree | d8073c4ddddc9c4624f6783c68ac770fd0fbc489 /app | |
| parent | f351cc28c2c878bf491bb0886be65bf35b58b261 (diff) | |
| parent | a13eae6afaaac070da61b72392f1b830fad33546 (diff) | |
| download | gitlab-ce-e7ec1db63c18758e34f983b2f26f3fe7a3a1b631.tar.gz | |
Merge branch 'rs-buttons-partial' into 'master'
Further simplify app/views/projects/buttons/_dropdown.html.haml
See merge request gitlab-org/gitlab-ce!16503
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/buttons/_dropdown.html.haml | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml index a94d9c14722..dab94d10bb1 100644 --- a/app/views/projects/buttons/_dropdown.html.haml +++ b/app/views/projects/buttons/_dropdown.html.haml @@ -9,34 +9,27 @@ - can_create_snippet = can?(current_user, :create_snippet, @project) - if can_create_issue - %li - = link_to _('New issue'), new_project_issue_path(@project) + %li= link_to _('New issue'), new_project_issue_path(@project) + - if merge_project - %li - = link_to _('New merge request'), project_new_merge_request_path(merge_project) + %li= link_to _('New merge request'), project_new_merge_request_path(merge_project) + - if can_create_snippet - %li - = link_to _('New snippet'), new_project_snippet_path(@project) + %li= 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 _('New file'), project_new_blob_path(@project, @project.default_branch || 'master') + %li= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master') - unless @project.empty_repo? - %li - = link_to _('New branch'), new_project_branch_path(@project) - %li - = link_to _('New tag'), new_project_tag_path(@project) + %li= link_to _('New branch'), new_project_branch_path(@project) + %li= link_to _('New tag'), new_project_tag_path(@project) - elsif current_user && current_user.already_forked?(@project) - %li - = link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master') + %li= 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'), - notice: edit_in_new_fork_notice, - 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 _('New file'), fork_path, method: :post + - continue_params = { to: project_new_blob_path(@project, @project.default_branch || 'master'), + notice: edit_in_new_fork_notice, + notice_now: edit_in_new_fork_notice_now } + - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params) + %li= link_to _('New file'), fork_path, method: :post |