Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f02210ca
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,发现更多精彩内容 >>
提交
f02210ca
编写于
2月 15, 2017
作者:
B
blackst0ne
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/master'
上级
6eb34e60
14527293
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
41 addition
and
10 deletion
+41
-10
CHANGELOG.md
CHANGELOG.md
+21
-0
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+0
-1
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+2
-0
app/views/dashboard/_activity_head.html.haml
app/views/dashboard/_activity_head.html.haml
+8
-7
changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml
...leased/27631-fix-small-height-of-activity-header-page.yml
+4
-0
changelogs/unreleased/28142-overlap-bugs.yml
changelogs/unreleased/28142-overlap-bugs.yml
+4
-0
lib/gitlab/sidekiq_status/client_middleware.rb
lib/gitlab/sidekiq_status/client_middleware.rb
+1
-1
lib/gitlab/sidekiq_status/server_middleware.rb
lib/gitlab/sidekiq_status/server_middleware.rb
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
f02210ca
...
...
@@ -2,6 +2,13 @@
documentation
](
doc/development/changelog.md
)
for instructions on adding your own
entry.
## 8.16.5 (2017-02-14)
-
Patch Asciidocs rendering to block XSS.
-
Fix XSS vulnerability in SVG attachments.
-
Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects.
-
Patch XSS vulnerability in RDOC support.
## 8.16.4 (2017-02-02)
-
Support non-ASCII characters in GFM autocomplete. !8729
...
...
@@ -174,6 +181,13 @@ entry.
-
Add margin to markdown math blocks.
-
Add hover state to MR comment reply button.
## 8.15.6 (2017-02-14)
-
Patch Asciidocs rendering to block XSS.
-
Fix XSS vulnerability in SVG attachments.
-
Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects.
-
Patch XSS vulnerability in RDOC support.
## 8.15.4 (2017-01-09)
-
Make successful pipeline emails off for watchers. !8176
...
...
@@ -437,6 +451,13 @@ entry.
-
Whitelist next project names: help, ci, admin, search. !8227
-
Adds back CSS for progress-bars. !8237
## 8.14.9 (2017-02-14)
-
Patch Asciidocs rendering to block XSS.
-
Fix XSS vulnerability in SVG attachments.
-
Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects.
-
Patch XSS vulnerability in RDOC support.
## 8.14.8 (2017-01-25)
-
Accept environment variables from the
`pre-receive`
script. !7967
...
...
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
f02210ca
...
...
@@ -193,7 +193,6 @@
top
:
$header-height
;
bottom
:
0
;
right
:
0
;
z-index
:
8
;
transition
:
width
.3s
;
background
:
$gray-light
;
padding
:
10px
20px
;
...
...
app/assets/stylesheets/pages/tree.scss
浏览文件 @
f02210ca
...
...
@@ -171,6 +171,8 @@
.tree-controls
{
float
:
right
;
margin-top
:
11px
;
position
:
relative
;
z-index
:
2
;
.project-action-button
{
margin-left
:
$btn-side-margin
;
...
...
app/views/dashboard/_activity_head.html.haml
浏览文件 @
f02210ca
%ul
.nav-links
%li
{
class:
(
"active"
unless
params
[
:filter
])
}
>
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your Projects
%li
{
class:
(
"active"
if
params
[
:filter
]
==
'starred'
)
}
>
=
link_to
activity_dashboard_path
(
filter:
'starred'
),
data:
{
placement:
'right'
}
do
Starred Projects
.top-area
%ul
.nav-links
%li
{
class:
(
"active"
unless
params
[
:filter
])
}
>
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your Projects
%li
{
class:
(
"active"
if
params
[
:filter
]
==
'starred'
)
}
>
=
link_to
activity_dashboard_path
(
filter:
'starred'
),
data:
{
placement:
'right'
}
do
Starred Projects
changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml
0 → 100644
浏览文件 @
f02210ca
---
title
:
"
Fix
small
height
of
activity
header
page"
merge_request
:
8952
author
:
Pavel Sorokin
changelogs/unreleased/28142-overlap-bugs.yml
0 → 100644
浏览文件 @
f02210ca
---
title
:
Fix z index issues with sidebar
merge_request
:
author
:
lib/gitlab/sidekiq_status/client_middleware.rb
浏览文件 @
f02210ca
...
...
@@ -2,7 +2,7 @@ module Gitlab
module
SidekiqStatus
class
ClientMiddleware
def
call
(
_
,
job
,
_
,
_
)
SidekiqStatus
.
set
(
job
[
'jid'
])
Gitlab
::
SidekiqStatus
.
set
(
job
[
'jid'
])
yield
end
end
...
...
lib/gitlab/sidekiq_status/server_middleware.rb
浏览文件 @
f02210ca
...
...
@@ -4,7 +4,7 @@ module Gitlab
def
call
(
worker
,
job
,
queue
)
ret
=
yield
SidekiqStatus
.
unset
(
job
[
'jid'
])
Gitlab
::
SidekiqStatus
.
unset
(
job
[
'jid'
])
ret
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录