Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e48a0b8e
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 搜索 >>
提交
e48a0b8e
编写于
1月 21, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
usability improvements
上级
c5a48a6a
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
40 addition
and
29 deletion
+40
-29
app/assets/stylesheets/issues.css.scss
app/assets/stylesheets/issues.css.scss
+2
-2
app/assets/stylesheets/style.scss
app/assets/stylesheets/style.scss
+1
-1
app/assets/stylesheets/top_panel.scss
app/assets/stylesheets/top_panel.scss
+1
-2
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+7
-0
app/views/deploy_keys/_form.html.haml
app/views/deploy_keys/_form.html.haml
+1
-1
app/views/deploy_keys/index.html.haml
app/views/deploy_keys/index.html.haml
+1
-1
app/views/issues/_form.html.haml
app/views/issues/_form.html.haml
+1
-1
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+6
-4
app/views/merge_requests/_form.html.haml
app/views/merge_requests/_form.html.haml
+1
-1
app/views/merge_requests/index.html.haml
app/views/merge_requests/index.html.haml
+16
-13
app/views/snippets/_form.html.haml
app/views/snippets/_form.html.haml
+3
-3
未找到文件。
app/assets/stylesheets/issues.css.scss
浏览文件 @
e48a0b8e
...
...
@@ -11,8 +11,8 @@
}
.issues_filter
{
margin
-top
:
10px
;
.left
{
margin
:
10px
0
;
.left
{
margin-right
:
15px
;
}
}
...
...
app/assets/stylesheets/style.scss
浏览文件 @
e48a0b8e
...
...
@@ -440,7 +440,7 @@ header .account-box img{
right
:
20px
;
position
:
absolute
;
width
:
33px
;
height
:
33px
;
display
:
block
;
box-shadow
:
0
1px
2px
black
;
top
:
0
;}
display
:
block
;
top
:
0
;}
header
.account-box
img
:after
{
content
:
" "
;
display
:
block
;
...
...
app/assets/stylesheets/top_panel.scss
浏览文件 @
e48a0b8e
...
...
@@ -139,8 +139,7 @@ body header {
.rss-icon
{
margin
:
0
15px
;
padding
:
3px
;
border
:
1px
solid
#
ccc
;
border
:
1px
solid
#
AAA
;
border-radius
:
3px
;
float
:left
;
background
:
#DDD
;
}
app/controllers/merge_requests_controller.rb
浏览文件 @
e48a0b8e
...
...
@@ -21,6 +21,13 @@ class MergeRequestsController < ApplicationController
def
index
@merge_requests
=
@project
.
merge_requests
@merge_requests
=
case
params
[
:f
].
to_i
when
2
then
@merge_requests
.
closed
else
@merge_requests
.
opened
end
@merge_requests
=
@merge_requests
.
includes
(
:author
,
:project
)
end
def
show
...
...
app/views/deploy_keys/_form.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -14,5 +14,5 @@
%td
=
f
.
text_area
:key
,
:style
=>
"width:300px; height:130px"
%br
.merge-tabs
=
f
.
submit
'Save'
,
:class
=>
"
grey
-button"
=
f
.
submit
'Save'
,
:class
=>
"
positive
-button"
app/views/deploy_keys/index.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -9,7 +9,7 @@
.notice_holder
%li
Deploy Keys do not exist yet.
-
if
can?
current_user
,
:admin_project
,
@project
%li
You can add a new one by clicking on
plus ic
on
%li
You can add a new one by clicking on
"Add New" butt
on
:javascript
$
(
'
.delete-key
'
).
live
(
'
ajax:success
'
,
function
()
{
...
...
app/views/issues/_form.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -44,7 +44,7 @@
%br
%br
.merge-tabs
=
f
.
submit
'Save'
,
:class
=>
"
grey
-button"
=
f
.
submit
'Save'
,
:class
=>
"
positive
-button"
-
unless
@issue
.
new_record?
.right
...
...
app/views/issues/index.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -7,18 +7,20 @@
%div
#issues-table-holder
.top_panel_issues
=
form_tag
search_project_issues_path
(
@project
),
:method
=>
:get
,
:remote
=>
true
,
:class
=>
:
lef
t
,
:id
=>
"issue_search_form"
do
=
form_tag
search_project_issues_path
(
@project
),
:method
=>
:get
,
:remote
=>
true
,
:class
=>
:
righ
t
,
:id
=>
"issue_search_form"
do
=
hidden_field_tag
:project_id
,
@project
.
id
,
{
:id
=>
'project_id'
}
=
search_field_tag
:issue_search
,
nil
,
{
:placeholder
=>
'Search'
,
:class
=>
'issue_search'
}
.
righ
t.issues_filter
.
lef
t.issues_filter
=
form_tag
project_issues_path
(
@project
),
:method
=>
:get
do
.left
=
radio_button_tag
:f
,
0
,
(
params
[
:f
]
||
"0"
)
==
"0"
,
:onclick
=>
"setIssueFilter(this.form, 0)"
,
:id
=>
"open_issues"
,
:class
=>
"status"
=
label_tag
"open_issues"
,
"Open"
=
label_tag
"open_issues"
do
%span
.tag.open
Open
.left
=
radio_button_tag
:f
,
2
,
params
[
:f
]
==
"2"
,
:onclick
=>
"setIssueFilter(this.form, 2)"
,
:id
=>
"closed_issues"
,
:class
=>
"status"
=
label_tag
"closed_issues"
,
"Closed"
=
label_tag
"closed_issues"
do
%span
.tag.closed
Closed
.left
=
radio_button_tag
:f
,
3
,
params
[
:f
]
==
"3"
,
:onclick
=>
"setIssueFilter(this.form, 3)"
,
:id
=>
"my_issues"
,
:class
=>
"status"
=
label_tag
"my_issues"
,
"To Me"
...
...
app/views/merge_requests/_form.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -36,7 +36,7 @@
%br
%br
.merge-tabs
=
f
.
submit
'Save'
,
:class
=>
"
grey
-button"
=
f
.
submit
'Save'
,
:class
=>
"
positive
-button"
-
unless
@merge_request
.
new_record?
.right
...
...
app/views/merge_requests/index.html.haml
浏览文件 @
e48a0b8e
=
render
"merge_requests/head"
-
if
@merge_requests
.
opened
.
count
>
0
%div
{
:class
=>
"update-data ui-box ui-box-small ui-box-big"
}
%h3
%span
.tag.open
Open
.data
=
render
@merge_requests
.
opened
.left.issues_filter
=
form_tag
project_merge_requests_path
(
@project
),
:method
=>
:get
do
.left
=
radio_button_tag
:f
,
0
,
(
params
[
:f
]
||
"0"
)
==
"0"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"open_merge_requests"
,
:class
=>
"status"
=
label_tag
"open_merge_requests"
do
%span
.tag.open
Open
.left
=
radio_button_tag
:f
,
2
,
params
[
:f
]
==
"2"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"closed_merge_requests"
,
:class
=>
"status"
=
label_tag
"closed_merge_requests"
do
%span
.tag.closed
Closed
.clear
%b
r
.clear
%h
r
-
if
@merge_requests
.
c
losed
.
c
ount
>
0
-
if
@merge_requests
.
count
>
0
%div
{
:class
=>
"update-data ui-box ui-box-small ui-box-big"
}
%h3
%span
.tag.closed
Closed
.data
=
render
@merge_requests
.
closed
=
render
@merge_requests
.clear
%br
-
unless
@merge_requests
.
count
>
0
-
unless
@merge_requests
.
count
>
0
||
params
[
:f
]
==
"2"
.notice_holder
%li
Merge Requests do not exist yet.
-
if
can?
current_user
,
:write_merge_request
,
@project
...
...
app/views/snippets/_form.html.haml
浏览文件 @
e48a0b8e
...
...
@@ -4,12 +4,12 @@
-
if
@snippet
.
new_record?
=
link_to
project_snippets_path
(
@project
)
do
.entity-button
Back
Snippets
%i
-
else
=
link_to
project_snippet_path
(
@project
,
@snippet
)
do
.entity-button
Back
Show Snippet
%i
%h2
=
@snippet
.
new_record?
?
"New Snippet"
:
"Edit Snippet #
#{
@snippet
.
id
}
"
...
...
@@ -40,7 +40,7 @@
=
f
.
text_area
:content
.merge-tabs
=
f
.
submit
'Save'
,
:class
=>
"
grey
-button"
=
f
.
submit
'Save'
,
:class
=>
"
positive
-button"
-
unless
@snippet
.
new_record?
.right
=
link_to
'Destroy'
,
[
@project
,
@snippet
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"red-button delete-snippet"
,
:id
=>
"destroy_snippet_
#{
@snippet
.
id
}
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录