Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9bad736f
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,发现更多精彩内容 >>
提交
9bad736f
编写于
12月 02, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unnecesary wrapper elements
上级
a70c5078
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
15 addition
and
26 deletion
+15
-26
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-4
app/views/projects/_commit_button.html.haml
app/views/projects/_commit_button.html.haml
+1
-3
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+2
-3
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-2
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+5
-6
app/views/projects/notes/_edit_form.html.haml
app/views/projects/notes/_edit_form.html.haml
+2
-3
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+4
-5
未找到文件。
app/assets/stylesheets/pages/merge_requests.scss
浏览文件 @
9bad736f
...
...
@@ -192,10 +192,6 @@
line-height
:
1
.1
;
}
.merge-request-form-info
{
padding-top
:
15px
;
}
// hide mr close link for inline diff comment form
.diff-file
.close-mr-link
,
.diff-file
.reopen-mr-link
{
...
...
app/views/projects/_commit_button.html.haml
浏览文件 @
9bad736f
.form-actions
.commit-button-annotation
=
button_tag
'Commit Changes'
,
class:
'btn commit-btn js-commit-button btn-create'
=
button_tag
'Commit Changes'
,
class:
'btn commit-btn js-commit-button btn-create'
=
link_to
'Cancel'
,
cancel_path
,
class:
'btn btn-cancel'
,
data:
{
confirm:
leave_edit_message
}
app/views/projects/issues/_form.html.haml
浏览文件 @
9bad736f
%div
.issue-form-holder
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form'
}
do
|
f
|
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form js-requires-input'
}
do
|
f
|
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
:javascript
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
...
...
app/views/projects/merge_requests/_form.html.haml
浏览文件 @
9bad736f
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form js-requires-input'
}
do
|
f
|
.merge-request-form-info
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
:javascript
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
...
...
app/views/projects/merge_requests/_new_submit.html.haml
浏览文件 @
9bad736f
...
...
@@ -11,12 +11,11 @@
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form js-requires-input'
}
do
|
f
|
.merge-request-form-info
=
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
=
f
.
hidden_field
:target_branch
=
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
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
%ul
.merge-request-tabs
...
...
app/views/projects/notes/_edit_form.html.haml
浏览文件 @
9bad736f
...
...
@@ -6,6 +6,5 @@
=
render
'projects/notes/hints'
.note-form-actions
.buttons
=
f
.
submit
'Save Comment'
,
class:
'btn btn-primary btn-save btn-grouped js-comment-button'
=
link_to
'Cancel'
,
'#'
,
class:
'btn btn-cancel note-edit-cancel'
=
f
.
submit
'Save Comment'
,
class:
'btn btn-primary btn-save btn-grouped js-comment-button'
=
link_to
'Cancel'
,
'#'
,
class:
'btn btn-cancel note-edit-cancel'
app/views/projects/notes/_form.html.haml
浏览文件 @
9bad736f
...
...
@@ -12,8 +12,7 @@
=
render
'projects/notes/hints'
.error-alert
.note-form-actions
.buttons.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-green comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
%a
.btn.grouped.js-close-discussion-note-form
Cancel
.note-form-actions.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-create comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-close-discussion-note-form
Cancel
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录