Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d25026a5
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 搜索 >>
提交
d25026a5
编写于
5月 25, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Accepted and Rejected tabs to MR lists.
上级
ebe9c890
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
36 addition
and
13 deletion
+36
-13
CHANGELOG
CHANGELOG
+1
-0
app/finders/issuable_finder.rb
app/finders/issuable_finder.rb
+4
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+6
-1
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+1
-1
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+1
-1
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+1
-1
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+1
-1
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+1
-1
app/views/shared/_issuable_filter.html.haml
app/views/shared/_issuable_filter.html.haml
+19
-6
未找到文件。
CHANGELOG
浏览文件 @
d25026a5
...
@@ -8,6 +8,7 @@ v 7.12.0 (unreleased)
...
@@ -8,6 +8,7 @@ v 7.12.0 (unreleased)
- Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
- Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
- Use the user list from the target project in a merge request (Stan Hu)
- Use the user list from the target project in a merge request (Stan Hu)
- Consistently refer to MRs as either Accepted or Rejected.
- Consistently refer to MRs as either Accepted or Rejected.
- Add Accepted and Rejected tabs to MR lists.
v 7.11.2
v 7.11.2
- no changes
- no changes
...
...
app/finders/issuable_finder.rb
浏览文件 @
d25026a5
...
@@ -75,6 +75,10 @@ class IssuableFinder
...
@@ -75,6 +75,10 @@ class IssuableFinder
case
params
[
:state
]
case
params
[
:state
]
when
'closed'
when
'closed'
items
.
closed
items
.
closed
when
'rejected'
items
.
respond_to?
(
:rejected
)
?
items
.
rejected
:
items
.
closed
when
'merged'
items
.
respond_to?
(
:merged
)
?
items
.
merged
:
items
.
closed
when
'all'
when
'all'
items
items
when
'opened'
when
'opened'
...
...
app/helpers/application_helper.rb
浏览文件 @
d25026a5
...
@@ -330,7 +330,12 @@ module ApplicationHelper
...
@@ -330,7 +330,12 @@ module ApplicationHelper
end
end
def
state_filters_text_for
(
entity
,
project
)
def
state_filters_text_for
(
entity
,
project
)
entity_title
=
entity
.
to_s
.
humanize
titles
=
{
opened:
"Open"
,
merged:
"Accepted"
}
entity_title
=
titles
[
entity
]
||
entity
.
to_s
.
humanize
count
=
count
=
if
project
.
nil?
if
project
.
nil?
...
...
app/views/dashboard/issues.html.haml
浏览文件 @
d25026a5
...
@@ -17,5 +17,5 @@
...
@@ -17,5 +17,5 @@
=
link_to
issues_dashboard_url
(
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
=
link_to
issues_dashboard_url
(
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :issues
=
render
'shared/issues'
=
render
'shared/issues'
app/views/dashboard/merge_requests.html.haml
浏览文件 @
d25026a5
...
@@ -7,5 +7,5 @@
...
@@ -7,5 +7,5 @@
List all merge requests from all projects you have access to.
List all merge requests from all projects you have access to.
%hr
%hr
.append-bottom-20
.append-bottom-20
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :merge_requests
=
render
'shared/merge_requests'
=
render
'shared/merge_requests'
app/views/groups/issues.html.haml
浏览文件 @
d25026a5
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
=
link_to
issues_group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
=
link_to
issues_group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :issues
=
render
'shared/issues'
=
render
'shared/issues'
app/views/groups/merge_requests.html.haml
浏览文件 @
d25026a5
...
@@ -10,5 +10,5 @@
...
@@ -10,5 +10,5 @@
To see all merge requests you should visit
#{
link_to
'dashboard'
,
merge_requests_dashboard_path
}
page.
To see all merge requests you should visit
#{
link_to
'dashboard'
,
merge_requests_dashboard_path
}
page.
%hr
%hr
.append-bottom-20
.append-bottom-20
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :merge_requests
=
render
'shared/merge_requests'
=
render
'shared/merge_requests'
app/views/projects/issues/index.html.haml
浏览文件 @
d25026a5
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%i
.fa.fa-plus
%i
.fa.fa-plus
New Issue
New Issue
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :issues
.issues-holder
.issues-holder
=
render
"issues"
=
render
"issues"
app/views/projects/merge_requests/index.html.haml
浏览文件 @
d25026a5
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
=
link_to
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new pull-left"
,
title:
"New Merge Request"
do
=
link_to
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new pull-left"
,
title:
"New Merge Request"
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Merge Request
New Merge Request
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
,
type: :merge_requests
.merge-requests-holder
.merge-requests-holder
=
render
'merge_requests'
=
render
'merge_requests'
app/views/shared/_issuable_filter.html.haml
浏览文件 @
d25026a5
...
@@ -3,15 +3,28 @@
...
@@ -3,15 +3,28 @@
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
{
class:
(
"active"
if
params
[
:state
]
==
'opened'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'opened'
)}
=
link_to
page_filter_path
(
state:
'opened'
)
do
=
link_to
page_filter_path
(
state:
'opened'
)
do
%i
.fa.fa-exclamation-circle
=
icon
(
'exclamation-circle'
)
#{
state_filters_text_for
(
:opened
,
@project
)
}
#{
state_filters_text_for
(
:opened
,
@project
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
=
link_to
page_filter_path
(
state:
'closed'
)
do
-
if
defined?
(
type
)
&&
type
==
:merge_requests
%i
.fa.fa-check-circle
%li
{
class:
(
"active"
if
params
[
:state
]
==
'merged'
)}
#{
state_filters_text_for
(
:closed
,
@project
)
}
=
link_to
page_filter_path
(
state:
'merged'
)
do
=
icon
(
'check-circle'
)
#{
state_filters_text_for
(
:merged
,
@project
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'rejected'
)}
=
link_to
page_filter_path
(
state:
'rejected'
)
do
=
icon
(
'ban'
)
#{
state_filters_text_for
(
:rejected
,
@project
)
}
-
else
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
=
link_to
page_filter_path
(
state:
'closed'
)
do
=
icon
(
'check-circle'
)
#{
state_filters_text_for
(
:closed
,
@project
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
=
link_to
page_filter_path
(
state:
'all'
)
do
=
link_to
page_filter_path
(
state:
'all'
)
do
%i
.fa.fa-compass
=
icon
(
'compass'
)
#{
state_filters_text_for
(
:all
,
@project
)
}
#{
state_filters_text_for
(
:all
,
@project
)
}
.issues-details-filters
.issues-details-filters
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录