Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
44dc9aa6
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,发现更多精彩内容 >>
提交
44dc9aa6
编写于
1月 07, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typo in js method and some repeating css
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
4443a5f3
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
16 addition
and
7 deletion
+16
-7
app/assets/javascripts/commits.js.coffee
app/assets/javascripts/commits.js.coffee
+3
-3
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+9
-0
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+4
-4
未找到文件。
app/assets/javascripts/commits.js.coffee
浏览文件 @
44dc9aa6
...
@@ -24,19 +24,19 @@ class @CommitsList
...
@@ -24,19 +24,19 @@ class @CommitsList
form
=
$
(
".commits-search-form"
)
form
=
$
(
".commits-search-form"
)
search
=
@
searchField
.
val
()
search
=
@
searchField
.
val
()
commitsUrl
=
form
.
attr
(
"action"
)
+
'?'
+
form
.
serialize
()
commitsUrl
=
form
.
attr
(
"action"
)
+
'?'
+
form
.
serialize
()
@
setOpacit
i
y
(
0.5
)
@
setOpacity
(
0.5
)
$
.
ajax
$
.
ajax
type
:
"GET"
type
:
"GET"
url
:
form
.
attr
(
"action"
)
url
:
form
.
attr
(
"action"
)
data
:
form
.
serialize
()
data
:
form
.
serialize
()
complete
:
=>
complete
:
=>
@
setOpacit
i
y
(
1.0
)
@
setOpacity
(
1.0
)
success
:
(
data
)
=>
success
:
(
data
)
=>
@
content
.
html
(
data
.
html
)
@
content
.
html
(
data
.
html
)
# Change url so if user reload a page - search results are saved
# Change url so if user reload a page - search results are saved
history
.
replaceState
{
page
:
commitsUrl
},
document
.
title
,
commitsUrl
history
.
replaceState
{
page
:
commitsUrl
},
document
.
title
,
commitsUrl
dataType
:
"json"
dataType
:
"json"
@
setOpacit
i
y
:
(
opacity
)
->
@
setOpacity
:
(
opacity
)
->
@
content
.
css
(
"opacity"
,
opacity
)
@
content
.
css
(
"opacity"
,
opacity
)
app/assets/stylesheets/framework/blocks.scss
浏览文件 @
44dc9aa6
...
@@ -72,6 +72,15 @@
...
@@ -72,6 +72,15 @@
>
p
:last-child
{
>
p
:last-child
{
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.block-controls
{
float
:
right
;
.control
{
float
:
left
;
margin-left
:
10px
;
}
}
}
}
.cover-block
{
.cover-block
{
...
...
app/views/projects/commits/show.html.haml
浏览文件 @
44dc9aa6
...
@@ -10,19 +10,19 @@
...
@@ -10,19 +10,19 @@
.tree-ref-holder
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
=
render
'shared/ref_switcher'
,
destination:
'commits'
.
pull-right
.hidden-xs.hidden-sm
.
block-controls
.hidden-xs.hidden-sm
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
.
pull-left.prepend-left-10
.
control
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
icon
(
'plus'
)
=
icon
(
'plus'
)
Create Merge Request
Create Merge Request
.
pull-left.prepend-left-10
.
control
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'pull-left commits-search-form'
)
do
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'pull-left commits-search-form'
)
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
-
if
current_user
&&
current_user
.
private_token
-
if
current_user
&&
current_user
.
private_token
.
pull-left.prepend-left-10
.
control
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Commits Feed"
,
class:
'btn'
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Commits Feed"
,
class:
'btn'
do
=
icon
(
"rss"
)
=
icon
(
"rss"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录