Skip to content

G
gitlab-ce
Commit 7ae62fc0 authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-05 

# Conflicts:
#	CHANGELOG.md

[ci skip]
parents ef250e65 93846eb1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
CHANGELOG.md
View file @ 7ae62fc0
...@@ -4,9 +4,14 @@ entry. ...@@ -4,9 +4,14 @@ entry.
## 11.4.5 (2018-11-04) ## 11.4.5 (2018-11-04)
<<<<<<< HEAD
### Fixed (5 changes, 1 of them is from the community) ### Fixed (5 changes, 1 of them is from the community)
- Fix stuck job warning message. !8060 - Fix stuck job warning message. !8060
=======
### Fixed (4 changes, 1 of them is from the community)
>>>>>>> upstream/master
- fix link to enable usage ping from convdev index. !22545 (Anand Capur) - fix link to enable usage ping from convdev index. !22545 (Anand Capur)
- Update gitlab-ui dependency to 1.8.0-hotfix.1 to fix IE11 bug. - Update gitlab-ui dependency to 1.8.0-hotfix.1 to fix IE11 bug.
- Remove duplicate escape in job sidebar. - Remove duplicate escape in job sidebar.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7