Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
21209a87
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
21209a87
编写于
7月 24, 2016
作者:
W
winniehell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make branches sortable without push permission (!5462)
上级
0c799be6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
20 deletion
+24
-20
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+23
-20
未找到文件。
CHANGELOG
浏览文件 @
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)
...
...
app/views/projects/branches/index.html.haml
浏览文件 @
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
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录