From 21209a87df975deec3f1184c7622df7b57ad1e13 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Sun, 24 Jul 2016 22:13:46 +0200
Subject: [PATCH] Make branches sortable without push permission (!5462)
---
CHANGELOG | 1 +
app/views/projects/branches/index.html.haml | 43 +++++++++++----------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 432d251dfc6b9..93af465e2a0e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.11.0 (unreleased)
- Make fork counter always clickable. !5463 (winniehell)
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le)
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
+ - Make branches sortable without push permission !5462 (winniehell)
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 6f806e3ce53fe..cb190d121c214 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|
--
GitLab