Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
f02210ca06
21
CHANGELOG.md
21
CHANGELOG.md
|
@ -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
|
||||
|
|
|
@ -193,7 +193,6 @@
|
|||
top: $header-height;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 8;
|
||||
transition: width .3s;
|
||||
background: $gray-light;
|
||||
padding: 10px 20px;
|
||||
|
|
|
@ -171,6 +171,8 @@
|
|||
.tree-controls {
|
||||
float: right;
|
||||
margin-top: 11px;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
.project-action-button {
|
||||
margin-left: $btn-side-margin;
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
%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
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: "Fix small height of activity header page"
|
||||
merge_request: 8952
|
||||
author: Pavel Sorokin
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix z index issues with sidebar
|
||||
merge_request:
|
||||
author:
|
|
@ -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
|
||||
|
|
|
@ -4,7 +4,7 @@ module Gitlab
|
|||
def call(worker, job, queue)
|
||||
ret = yield
|
||||
|
||||
SidekiqStatus.unset(job['jid'])
|
||||
Gitlab::SidekiqStatus.unset(job['jid'])
|
||||
|
||||
ret
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue