diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-07-26 21:28:51 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-26 21:28:51 +0000 |
commit | 39ed6290efc31ec99c28addd3f15f2e5eb20c1cd (patch) | |
tree | 73faddfa07669f40eb2a671da033819bb50c1091 /app/views | |
parent | 0676b7991ec32f3c1d89245322b6834df9013b25 (diff) | |
parent | 21209a87df975deec3f1184c7622df7b57ad1e13 (diff) | |
download | gitlab-ce-39ed6290efc31ec99c28addd3f15f2e5eb20c1cd.tar.gz |
Merge branch 'sortable-branches-push-permission' into 'master'
Make branches sortable without push permission
## What does this MR do?
Make branches on the branches page sortable without push permission.
## Why was this MR needed?
Sorting branches (a readonly action) required push permission which does not make sense.
## What are the relevant issue numbers?
fixes #18678
## Screenshots
### Before
![before](/uploads/d77d0be2599481b815cb2ef1f9c33a15/before.png)
### After
![after](/uploads/edbcf9d5ec4b2650866742ead0c2c1ed/after.png)
See merge request !5462
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/branches/index.html.haml | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 6f806e3ce53..cb190d121c2 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -7,28 +7,31 @@ .nav-text Protected branches can be managed in project settings - - if can? current_user, :push_code, @project - .nav-controls - = form_tag(filter_branches_path, method: :get) do - = search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false } - .dropdown.inline - %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} - %span.light - - if params[:sort].present? - = params[:sort].humanize - - else - Name - %b.caret - %ul.dropdown-menu.dropdown-menu-align-right - %li - = link_to filter_branches_path(sort: nil) do - = sort_title_name - = link_to filter_branches_path(sort: 'recently_updated') do - = sort_title_recently_updated - = link_to filter_branches_path(sort: 'last_updated') do - = sort_title_oldest_updated + .nav-controls + = form_tag(filter_branches_path, method: :get) do + = search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false } + + .dropdown.inline + %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} + %span.light + - if params[:sort].present? + = params[:sort].humanize + - else + Name + %b.caret + %ul.dropdown-menu.dropdown-menu-align-right + %li + = link_to filter_branches_path(sort: nil) do + = sort_title_name + = link_to filter_branches_path(sort: 'recently_updated') do + = sort_title_recently_updated + = link_to filter_branches_path(sort: 'last_updated') do + = sort_title_oldest_updated + + - if can? current_user, :push_code, @project = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do New branch + - if @branches.any? %ul.content-list.all-branches - @branches.each do |branch| |