BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
21209a87
Commit
21209a87
authored
Jul 24, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make branches sortable without push permission (!5462)
parent
0c799be6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
CHANGELOG
CHANGELOG
+1
-0
index.html.haml
app/views/projects/branches/index.html.haml
+4
-1
No files found.
CHANGELOG
View file @
21209a87
...
@@ -12,6 +12,7 @@ v 8.11.0 (unreleased)
...
@@ -12,6 +12,7 @@ v 8.11.0 (unreleased)
- Make fork counter always clickable. !5463 (winniehell)
- 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)
- 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`
- 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 GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Add the `sprockets-es6` gem
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
...
...
app/views/projects/branches/index.html.haml
View file @
21209a87
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
.nav-text
.nav-text
Protected branches can be managed in project settings
Protected branches can be managed in project settings
-
if
can?
current_user
,
:push_code
,
@project
.nav-controls
.nav-controls
=
form_tag
(
filter_branches_path
,
method: :get
)
do
=
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
}
=
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
.dropdown.inline
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
%span
.light
...
@@ -27,8 +27,11 @@
...
@@ -27,8 +27,11 @@
=
sort_title_recently_updated
=
sort_title_recently_updated
=
link_to
filter_branches_path
(
sort:
'last_updated'
)
do
=
link_to
filter_branches_path
(
sort:
'last_updated'
)
do
=
sort_title_oldest_updated
=
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
=
link_to
new_namespace_project_branch_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
New branch
New branch
-
if
@branches
.
any?
-
if
@branches
.
any?
%ul
.content-list.all-branches
%ul
.content-list.all-branches
-
@branches
.
each
do
|
branch
|
-
@branches
.
each
do
|
branch
|
...
...
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