Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
21209a87
Commit
21209a87
authored
8 years ago
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make branches sortable without push permission (!5462)
parent
0c799be6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
20 deletions
+24
-20
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+23
-20
No files found.
CHANGELOG
View file @
21209a87
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/branches/index.html.haml
View file @
21209a87
...
...
@@ -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
|
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment