Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b510223e
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,发现更多精彩内容 >>
提交
b510223e
编写于
2月 26, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper
上级
6de4e4a6
01660f0d
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
19 addition
and
15 deletion
+19
-15
app/assets/javascripts/diff.js.coffee
app/assets/javascripts/diff.js.coffee
+2
-1
app/assets/javascripts/issue.js.coffee
app/assets/javascripts/issue.js.coffee
+6
-5
app/assets/javascripts/merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+7
-5
app/assets/stylesheets/sections/diff.scss
app/assets/stylesheets/sections/diff.scss
+1
-0
app/controllers/import/gitlab_controller.rb
app/controllers/import/gitlab_controller.rb
+1
-1
app/controllers/import/gitorious_controller.rb
app/controllers/import/gitorious_controller.rb
+1
-1
app/views/projects/deploy_keys/_deploy_key.html.haml
app/views/projects/deploy_keys/_deploy_key.html.haml
+1
-1
db/migrate/20150223022001_set_missing_last_activity_at.rb
db/migrate/20150223022001_set_missing_last_activity_at.rb
+0
-1
未找到文件。
app/assets/javascripts/diff.js.coffee
浏览文件 @
b510223e
class
@
Diff
UNFOLD_COUNT
=
20
constructor
:
->
$
(
document
).
off
(
'click'
,
'.js-unfold'
)
$
(
document
).
on
(
'click'
,
'.js-unfold'
,
(
event
)
=>
target
=
$
(
event
.
target
)
unfoldBottom
=
target
.
hasClass
(
'js-unfold-bottom'
)
...
...
@@ -36,7 +37,7 @@ class @Diff
)
)
$
(
'.diff-header'
).
stick_in_parent
(
offset_top
:
$
(
'.navbar'
).
height
())
$
(
'.diff-header'
).
stick_in_parent
(
recalc_every
:
1
,
offset_top
:
$
(
'.navbar'
).
height
())
lineNumbers
:
(
line
)
->
return
([
0
,
0
])
unless
line
.
children
().
length
...
...
app/assets/javascripts/issue.js.coffee
浏览文件 @
b510223e
...
...
@@ -16,6 +16,7 @@ class @Issue
updateTaskState
)
$
(
'.issue-details'
).
waitForImages
->
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
@
top
=
$
(
'.issue-details'
).
outerHeight
(
true
)
+
25
...
...
app/assets/javascripts/merge_request.js.coffee
浏览文件 @
b510223e
...
...
@@ -20,9 +20,10 @@ class @MergeRequest
if
$
(
"a.btn-close"
).
length
$
(
"li.task-list-item input:checkbox"
).
prop
(
"disabled"
,
false
)
$
(
'.merge-request-details'
).
waitForImages
->
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
@
top
=
$
(
'.merge-request-details'
).
outerHeight
(
true
)
+
70
@
top
=
$
(
'.merge-request-details'
).
outerHeight
(
true
)
+
91
bottom
:
->
@
bottom
=
$
(
'.footer'
).
outerHeight
(
true
)
...
...
@@ -95,6 +96,7 @@ class @MergeRequest
this
.
$
(
'.merge-request-tabs .diffs-tab'
).
addClass
'active'
this
.
loadDiff
()
unless
@
diffs_loaded
this
.
$
(
'.diffs'
).
show
()
$
(
".diff-header"
).
trigger
(
"sticky_kit:recalc"
)
when
'commits'
this
.
$
(
'.merge-request-tabs .commits-tab'
).
addClass
'active'
this
.
$
(
'.commits'
).
show
()
...
...
app/assets/stylesheets/sections/diff.scss
浏览文件 @
b510223e
...
...
@@ -8,6 +8,7 @@
border-bottom
:
1px
solid
#CCC
;
padding
:
5px
5px
5px
10px
;
color
:
#555
;
z-index
:
10
;
>
span
{
font-family
:
$monospace_font
;
...
...
app/controllers/import/gitlab_controller.rb
浏览文件 @
b510223e
...
...
@@ -17,7 +17,7 @@ class Import::GitlabController < Import::BaseController
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"gitlab"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
@repos
.
to_a
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
[
"path_with_namespace"
]
}
@repos
=
@repos
.
to_a
.
reject
{
|
repo
|
already_added_projects_names
.
include?
repo
[
"path_with_namespace"
]
}
end
def
jobs
...
...
app/controllers/import/gitorious_controller.rb
浏览文件 @
b510223e
...
...
@@ -15,7 +15,7 @@ class Import::GitoriousController < Import::BaseController
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"gitorious"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
@repos
.
to_a
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
.
full_name
}
@repos
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
.
full_name
}
end
def
jobs
...
...
app/views/projects/deploy_keys/_deploy_key.html.haml
浏览文件 @
b510223e
...
...
@@ -13,7 +13,7 @@
=
link_to
'Remove'
,
namespace_project_deploy_key_path
(
@project
.
namespace
,
@project
,
deploy_key
),
data:
{
confirm:
'You are going to remove deploy key. Are you sure?'
},
method: :delete
,
class:
"btn btn-remove delete-key btn-small pull-right"
=
key_project
=
deploy_key
.
projects
.
include?
(
@project
)
?
@project
:
deploy_key
.
projects
.
first
-
key_project
=
deploy_key
.
projects
.
include?
(
@project
)
?
@project
:
deploy_key
.
projects
.
first
=
link_to
namespace_project_deploy_key_path
(
key_project
.
namespace
,
key_project
,
deploy_key
)
do
%i
.fa.fa-key
%strong
=
deploy_key
.
title
...
...
db/migrate/20150223022001_set_missing_last_activity_at.rb
浏览文件 @
b510223e
...
...
@@ -4,6 +4,5 @@ class SetMissingLastActivityAt < ActiveRecord::Migration
end
def
down
raise
ActiveRecord
::
IrreversibleMigration
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录