Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
12c6abf9
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 搜索 >>
提交
12c6abf9
编写于
8月 02, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove nicescroll from jobs page and remove the library from common.bundle.js
上级
825224ba
变更
10
展开全部
隐藏空白更改
内联
并排
Showing
10 changed file
with
98 addition
and
3737 deletion
+98
-3737
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+0
-1
app/assets/javascripts/commons/jquery.js
app/assets/javascripts/commons/jquery.js
+0
-1
app/assets/stylesheets/framework/layout.scss
app/assets/stylesheets/framework/layout.scss
+2
-10
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+1
-4
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+1
-1
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+9
-0
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+85
-84
spec/javascripts/build_spec.js
spec/javascripts/build_spec.js
+0
-1
spec/javascripts/labels_issue_sidebar_spec.js
spec/javascripts/labels_issue_sidebar_spec.js
+0
-1
vendor/assets/javascripts/jquery.nicescroll.js
vendor/assets/javascripts/jquery.nicescroll.js
+0
-3634
未找到文件。
app/assets/javascripts/build.js
浏览文件 @
12c6abf9
...
@@ -164,7 +164,6 @@ window.Build = (function () {
...
@@ -164,7 +164,6 @@ window.Build = (function () {
Build
.
prototype
.
initSidebar
=
function
()
{
Build
.
prototype
.
initSidebar
=
function
()
{
this
.
$sidebar
=
$
(
'
.js-build-sidebar
'
);
this
.
$sidebar
=
$
(
'
.js-build-sidebar
'
);
this
.
$sidebar
.
niceScroll
();
};
};
Build
.
prototype
.
getBuildTrace
=
function
()
{
Build
.
prototype
.
getBuildTrace
=
function
()
{
...
...
app/assets/javascripts/commons/jquery.js
浏览文件 @
12c6abf9
...
@@ -6,6 +6,5 @@ import 'vendor/jquery.endless-scroll';
...
@@ -6,6 +6,5 @@ import 'vendor/jquery.endless-scroll';
import
'
vendor/jquery.caret
'
;
import
'
vendor/jquery.caret
'
;
import
'
vendor/jquery.atwho
'
;
import
'
vendor/jquery.atwho
'
;
import
'
vendor/jquery.scrollTo
'
;
import
'
vendor/jquery.scrollTo
'
;
import
'
vendor/jquery.nicescroll
'
;
import
'
vendor/jquery.waitforimages
'
;
import
'
vendor/jquery.waitforimages
'
;
import
'
select2/select2
'
;
import
'
select2/select2
'
;
app/assets/stylesheets/framework/layout.scss
浏览文件 @
12c6abf9
...
@@ -109,16 +109,8 @@ body {
...
@@ -109,16 +109,8 @@ body {
}
}
}
}
.page-with-sidebar
>
.content-wrapper
{
/* The following prevents side effects related to iOS Safari's implementation of -webkit-overflow-scrolling: touch,
min-height
:
calc
(
100vh
-
#{
$header-height
}
);
which is applied to the body by jquery.nicescroling plugin to force hardware acceleration for momentum scrolling. Side
effects are commonly related to inconsisent z-index behavior (e.g. tooltips). By applying the following to direct children
of the body element here, we negate cascading side effects but allow momentum scrolling to be applied to the body */
.navbar
,
.page-gutter
,
.page-with-sidebar
{
-webkit-overflow-scrolling
:
auto
;
}
}
.with-performance-bar
.page-with-sidebar
{
.with-performance-bar
.page-with-sidebar
{
...
...
app/assets/stylesheets/framework/sidebar.scss
浏览文件 @
12c6abf9
...
@@ -78,15 +78,12 @@
...
@@ -78,15 +78,12 @@
.right-sidebar
{
.right-sidebar
{
border-left
:
1px
solid
$border-color
;
border-left
:
1px
solid
$border-color
;
height
:
calc
(
100%
-
#{
$header-height
}
);
&
.affix
{
&
.affix
{
position
:
fixed
;
position
:
fixed
;
top
:
$header-height
;
top
:
$header-height
;
}
}
&
:not
(
.affix-top
)
{
min-height
:
100%
;
}
}
}
.with-performance-bar
.right-sidebar.affix
{
.with-performance-bar
.right-sidebar.affix
{
...
...
app/assets/stylesheets/new_sidebar.scss
浏览文件 @
12c6abf9
...
@@ -21,7 +21,7 @@ $new-sidebar-width: 220px;
...
@@ -21,7 +21,7 @@ $new-sidebar-width: 220px;
// Override position: absolute
// Override position: absolute
.right-sidebar
{
.right-sidebar
{
position
:
fixed
;
position
:
fixed
;
height
:
100%
;
height
:
calc
(
100%
-
#{
$header-height
}
)
;
}
}
.issues-bulk-update.right-sidebar.right-sidebar-expanded
.issuable-sidebar-header
{
.issues-bulk-update.right-sidebar.right-sidebar-expanded
.issuable-sidebar-header
{
...
...
app/assets/stylesheets/pages/builds.scss
浏览文件 @
12c6abf9
...
@@ -235,6 +235,15 @@
...
@@ -235,6 +235,15 @@
display
:
none
;
display
:
none
;
}
}
.sidebar-container
{
width
:
calc
(
100%
+
100px
);
padding-right
:
100px
;
height
:
100%
;
overflow-y
:
scroll
;
overflow-x
:
hidden
;
-webkit-overflow-scrolling
:
touch
;
}
.blocks-container
{
.blocks-container
{
padding
:
0
$gl-padding
;
padding
:
0
$gl-padding
;
}
}
...
...
app/views/projects/jobs/_sidebar.html.haml
浏览文件 @
12c6abf9
-
builds
=
@build
.
pipeline
.
builds
.
to_a
-
builds
=
@build
.
pipeline
.
builds
.
to_a
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
}
}
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
}
}
.blocks-container
.sidebar-container
.block
.blocks-container
%strong
=
@build
.
name
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle
{
href:
"#"
,
'aria-label'
:
'Toggle Sidebar'
,
role:
'button'
}
=
icon
(
'angle-double-right'
)
#js-details-block-vue
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
.block
.block
.title
%strong
Job artifacts
=
@build
.
name
-
if
@build
.
artifacts_expired?
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle
{
href:
"#"
,
'aria-label'
:
'Toggle Sidebar'
,
role:
'button'
}
%p
.build-detail-row
=
icon
(
'angle-double-right'
)
The artifacts were removed
#{
time_ago_with_tooltip
(
@build
.
artifacts_expire_at
)
}
-
elsif
@build
.
has_expiring_artifacts?
%p
.build-detail-row
The artifacts will be removed in
%span
.js-artifacts-remove
=
@build
.
artifacts_expire_at
-
if
@build
.
artifacts?
#js-details-block-vue
.btn-group.btn-group-justified
{
role: :group
}
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
Keep
=
link_to
download_project_job_artifacts_path
(
@project
,
@build
),
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-sm btn-default'
do
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
Download
.block
.title
Job artifacts
-
if
@build
.
artifacts_expired?
%p
.build-detail-row
The artifacts were removed
#{
time_ago_with_tooltip
(
@build
.
artifacts_expire_at
)
}
-
elsif
@build
.
has_expiring_artifacts?
%p
.build-detail-row
The artifacts will be removed in
%span
.js-artifacts-remove
=
@build
.
artifacts_expire_at
-
if
@build
.
artifacts_metadata?
-
if
@build
.
artifacts?
=
link_to
browse_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
do
.btn-group.btn-group-justified
{
role: :group
}
Browse
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
Keep
-
if
@build
.
trigger_request
=
link_to
download_project_job_artifacts_path
(
@project
,
@build
),
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-sm btn-default'
do
.build-widget.block
Download
%h4
.title
Trigger
%p
-
if
@build
.
artifacts_metadata?
%span
.build-light-text
Token:
=
link_to
browse_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
do
#{
@build
.
trigger_request
.
trigger
.
short_token
}
Browse
-
if
@build
.
trigger_request
.build-widget.block
%h4
.title
Trigger
-
if
@build
.
trigger_request
.
variables
%p
%p
%button
.btn.group.btn-group-justified.reveal-variables
Reveal Variables
%span
.build-light-text
Token:
#{
@build
.
trigger_request
.
trigger
.
short_token
}
-
if
@build
.
trigger_request
.
variables
%p
%button
.btn.group.btn-group-justified.reveal-variables
Reveal Variables
%dl
.js-build-variables.trigger-build-variables.hide
%dl
.js-build-variables.trigger-build-variables.hide
-
@build
.
trigger_request
.
variables
.
each
do
|
key
,
value
|
-
@build
.
trigger_request
.
variables
.
each
do
|
key
,
value
|
%dt
.js-build-variable.trigger-build-variable
=
key
%dt
.js-build-variable.trigger-build-variable
=
key
%dd
.js-build-value.trigger-build-value
=
value
%dd
.js-build-value.trigger-build-value
=
value
%div
{
class:
(
@build
.
pipeline
.
stages_count
>
1
?
"block"
:
"block-last"
)
}
%div
{
class:
(
@build
.
pipeline
.
stages_count
>
1
?
"block"
:
"block-last"
)
}
%p
%p
Commit
Commit
=
link_to
@build
.
pipeline
.
short_sha
,
project_commit_path
(
@project
,
@build
.
pipeline
.
sha
),
class:
'commit-sha link-commit'
=
link_to
@build
.
pipeline
.
short_sha
,
project_commit_path
(
@project
,
@build
.
pipeline
.
sha
),
class:
'commit-sha link-commit'
=
clipboard_button
(
text:
@build
.
pipeline
.
short_sha
,
title:
"Copy commit SHA to clipboard"
)
=
clipboard_button
(
text:
@build
.
pipeline
.
short_sha
,
title:
"Copy commit SHA to clipboard"
)
-
if
@build
.
merge_request
-
if
@build
.
merge_request
in
in
=
link_to
"
#{
@build
.
merge_request
.
to_reference
}
"
,
merge_request_path
(
@build
.
merge_request
),
class:
'link-commit'
=
link_to
"
#{
@build
.
merge_request
.
to_reference
}
"
,
merge_request_path
(
@build
.
merge_request
),
class:
'link-commit'
%p
.build-light-text.append-bottom-0
%p
.build-light-text.append-bottom-0
#{
@build
.
pipeline
.
git_commit_title
}
#{
@build
.
pipeline
.
git_commit_title
}
-
if
@build
.
pipeline
.
stages_count
>
1
-
if
@build
.
pipeline
.
stages_count
>
1
.dropdown.build-dropdown
.block-last
.dropdown.build-dropdown
%div
%div
%span
{
class:
"ci-status-icon-#{@build.pipeline.status}"
}
%span
{
class:
"ci-status-icon-#{@build.pipeline.status}"
}
=
ci_icon_for_status
(
@build
.
pipeline
.
status
)
=
ci_icon_for_status
(
@build
.
pipeline
.
status
)
Pipeline
Pipeline
=
link_to
"#
#{
@build
.
pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
@build
.
pipeline
),
class:
'link-commit'
=
link_to
"#
#{
@build
.
pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
@build
.
pipeline
),
class:
'link-commit'
from
from
=
link_to
"
#{
@build
.
pipeline
.
ref
}
"
,
project_branch_path
(
@project
,
@build
.
pipeline
.
ref
),
class:
'link-commit'
=
link_to
"
#{
@build
.
pipeline
.
ref
}
"
,
project_branch_path
(
@project
,
@build
.
pipeline
.
ref
),
class:
'link-commit'
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.stage-selection
More
%span
.stage-selection
More
=
icon
(
'chevron-down'
)
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu
%ul
.dropdown-menu
-
@build
.
pipeline
.
legacy_stages
.
each
do
|
stage
|
-
@build
.
pipeline
.
legacy_stages
.
each
do
|
stage
|
%li
%li
%a
.stage-item
=
stage
.
name
%a
.stage-item
=
stage
.
name
.builds-container
.builds-container
-
HasStatus
::
ORDERED_STATUSES
.
each
do
|
build_status
|
-
HasStatus
::
ORDERED_STATUSES
.
each
do
|
build_status
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
.build-job
{
class:
sidebar_build_class
(
build
,
@build
),
data:
{
stage:
build
.
stage
}
}
.build-job
{
class:
sidebar_build_class
(
build
,
@build
),
data:
{
stage:
build
.
stage
}
}
=
link_to
project_job_path
(
@project
,
build
)
do
=
link_to
project_job_path
(
@project
,
build
)
do
=
icon
(
'arrow-right'
)
=
icon
(
'arrow-right'
)
%span
{
class:
"ci-status-icon-#{build.status}"
}
%span
{
class:
"ci-status-icon-#{build.status}"
}
=
ci_icon_for_status
(
build
.
status
)
=
ci_icon_for_status
(
build
.
status
)
%span
%span
-
if
build
.
name
-
if
build
.
name
=
build
.
name
=
build
.
name
-
else
-
else
=
build
.
id
=
build
.
id
-
if
build
.
retried?
-
if
build
.
retried?
%i
.fa.fa-refresh.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
%i
.fa.fa-refresh.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
spec/javascripts/build_spec.js
浏览文件 @
12c6abf9
...
@@ -5,7 +5,6 @@ import '~/lib/utils/datetime_utility';
...
@@ -5,7 +5,6 @@ import '~/lib/utils/datetime_utility';
import
'
~/lib/utils/url_utility
'
;
import
'
~/lib/utils/url_utility
'
;
import
'
~/build
'
;
import
'
~/build
'
;
import
'
~/breakpoints
'
;
import
'
~/breakpoints
'
;
import
'
vendor/jquery.nicescroll
'
;
describe
(
'
Build
'
,
()
=>
{
describe
(
'
Build
'
,
()
=>
{
const
BUILD_URL
=
`
${
gl
.
TEST_HOST
}
/frontend-fixtures/builds-project/-/jobs/1`
;
const
BUILD_URL
=
`
${
gl
.
TEST_HOST
}
/frontend-fixtures/builds-project/-/jobs/1`
;
...
...
spec/javascripts/labels_issue_sidebar_spec.js
浏览文件 @
12c6abf9
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
import
'
select2
'
;
import
'
select2
'
;
import
'
vendor/jquery.nicescroll
'
;
import
'
~/api
'
;
import
'
~/api
'
;
import
'
~/create_label
'
;
import
'
~/create_label
'
;
import
'
~/issuable_context
'
;
import
'
~/issuable_context
'
;
...
...
vendor/assets/javascripts/jquery.nicescroll.js
已删除
100644 → 0
浏览文件 @
825224ba
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录