Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
60baa1e8
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,发现更多精彩内容 >>
提交
60baa1e8
编写于
6月 25, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move issuable partials in common directory
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
62886771
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
11 addition
and
11 deletion
+11
-11
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/_form.html.haml
app/views/projects/issues/_form.html.haml
+1
-1
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+2
-2
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+2
-2
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+0
-0
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+0
-0
app/views/shared/issuable/_search_form.html.haml
app/views/shared/issuable/_search_form.html.haml
+0
-0
未找到文件。
app/views/dashboard/issues.html.haml
浏览文件 @
60baa1e8
...
...
@@ -17,5 +17,5 @@
=
link_to
issues_dashboard_url
(
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
%i
.fa.fa-rss
=
render
'shared/issuable
_
filter'
,
type: :issues
=
render
'shared/issuable
/
filter'
,
type: :issues
=
render
'shared/issues'
app/views/dashboard/merge_requests.html.haml
浏览文件 @
60baa1e8
...
...
@@ -7,5 +7,5 @@
List all merge requests from all projects you have access to.
%hr
.append-bottom-20
=
render
'shared/issuable
_
filter'
,
type: :merge_requests
=
render
'shared/issuable
/
filter'
,
type: :merge_requests
=
render
'shared/merge_requests'
app/views/groups/issues.html.haml
浏览文件 @
60baa1e8
...
...
@@ -21,5 +21,5 @@
=
link_to
issues_group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
class:
'btn'
do
%i
.fa.fa-rss
=
render
'shared/issuable
_
filter'
,
type: :issues
=
render
'shared/issuable
/
filter'
,
type: :issues
=
render
'shared/issues'
app/views/groups/merge_requests.html.haml
浏览文件 @
60baa1e8
...
...
@@ -10,5 +10,5 @@
To see all merge requests you should visit
#{
link_to
'dashboard'
,
merge_requests_dashboard_path
}
page.
%hr
.append-bottom-20
=
render
'shared/issuable
_
filter'
,
type: :merge_requests
=
render
'shared/issuable
/
filter'
,
type: :merge_requests
=
render
'shared/merge_requests'
app/views/projects/issues/_form.html.haml
浏览文件 @
60baa1e8
...
...
@@ -3,7 +3,7 @@
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form'
}
do
|
f
|
=
render
'
projects/issuable_
form'
,
f:
f
,
issuable:
@issue
=
render
'
shared/issuable/
form'
,
f:
f
,
issuable:
@issue
:javascript
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
...
...
app/views/projects/issues/index.html.haml
浏览文件 @
60baa1e8
...
...
@@ -11,14 +11,14 @@
=
link_to
namespace_project_issues_path
(
@project
.
namespace
,
@project
,
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'btn append-right-10'
do
%i
.fa.fa-rss
=
render
'shared/issuable
_
search_form'
,
path:
namespace_project_issues_path
(
@project
.
namespace
,
@project
)
=
render
'shared/issuable
/
search_form'
,
path:
namespace_project_issues_path
(
@project
.
namespace
,
@project
)
-
if
can?
current_user
,
:write_issue
,
@project
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
issue:
{
assignee_id:
@issuable_finder
.
assignee
.
try
(
:id
),
milestone_id:
@issuable_finder
.
milestones
.
try
(
:first
).
try
(
:id
)
}),
class:
"btn btn-new pull-left"
,
title:
"New Issue"
,
id:
"new_issue_link"
do
%i
.fa.fa-plus
New Issue
=
render
'shared/issuable
_
filter'
,
type: :issues
=
render
'shared/issuable
/
filter'
,
type: :issues
.issues-holder
=
render
"issues"
app/views/projects/merge_requests/_form.html.haml
浏览文件 @
60baa1e8
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form'
}
do
|
f
|
.merge-request-form-info
=
render
'
projects/issuable_
form'
,
f:
f
,
issuable:
@merge_request
=
render
'
shared/issuable/
form'
,
f:
f
,
issuable:
@merge_request
:javascript
disableButtonIfEmptyField
(
"
#merge_request_title
"
,
"
.btn-save
"
);
...
...
app/views/projects/merge_requests/_new_submit.html.haml
浏览文件 @
60baa1e8
...
...
@@ -11,7 +11,7 @@
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form'
}
do
|
f
|
.merge-request-form-info
=
render
'
projects/issuable_
form'
,
f:
f
,
issuable:
@merge_request
=
render
'
shared/issuable/
form'
,
f:
f
,
issuable:
@merge_request
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
...
...
app/views/projects/merge_requests/index.html.haml
浏览文件 @
60baa1e8
-
page_title
"Merge Requests"
.append-bottom-10
.pull-right
=
render
'shared/issuable
_
search_form'
,
path:
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
)
=
render
'shared/issuable
/
search_form'
,
path:
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
)
-
if
can?
current_user
,
:write_merge_request
,
@project
.pull-left.hidden-xs
=
link_to
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
,
title:
"New Merge Request"
do
%i
.fa.fa-plus
New Merge Request
=
render
'shared/issuable
_
filter'
,
type: :merge_requests
=
render
'shared/issuable
/
filter'
,
type: :merge_requests
.merge-requests-holder
=
render
'merge_requests'
app/views/shared/
_issuable
_filter.html.haml
→
app/views/shared/
issuable/
_filter.html.haml
浏览文件 @
60baa1e8
文件已移动
app/views/
projects/_issuable
_form.html.haml
→
app/views/
shared/issuable/
_form.html.haml
浏览文件 @
60baa1e8
文件已移动
app/views/shared/
_issuable
_search_form.html.haml
→
app/views/shared/
issuable/
_search_form.html.haml
浏览文件 @
60baa1e8
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录