diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5556bf5bc0..f3ebcb10fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ stages: .use-mysql: &use-mysql services: - - mysql:latest + - mysql:5.7 - redis:alpine # Skip all jobs except the ones that begin with 'docs/'. diff --git a/CHANGELOG.md b/CHANGELOG.md index bc4726baf9..fcc4225afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,31 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.6.5 (2018-04-24) + +### Security (1 change) + +- Sanitizes user name to avoid XSS attacks. + + +## 10.6.4 (2018-04-09) + +### Fixed (8 changes, 1 of them is from the community) + +- Correct copy text for the promote milestone and label modals. !17726 +- Avoid validation errors when running the Pages domain verification service. !17992 +- Fix autolinking URLs containing ampersands. !18045 +- Fix exceptions raised when migrating pipeline stages in the background. !18076 +- Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert) +- Don't show Jump to Discussion button on Issues. +- Fix listing commit branch/tags that contain special characters. +- Fix 404 in group boards when moving issue between lists. + +### Performance (1 change) + +- Free open file descriptors and libgit2 buffers in UpdatePagesService. + + ## 10.6.3 (2018-04-03) ### Security (2 changes) diff --git a/VERSION b/VERSION index 15c6f3e7f7..cac93e55f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.3 +10.6.5 diff --git a/app/assets/javascripts/boards/services/board_service.js b/app/assets/javascripts/boards/services/board_service.js index d78d470197..7c90597f77 100644 --- a/app/assets/javascripts/boards/services/board_service.js +++ b/app/assets/javascripts/boards/services/board_service.js @@ -19,7 +19,7 @@ export default class BoardService { } static generateIssuePath(boardId, id) { - return `${gon.relative_url_root}/-/boards/${boardId ? `/${boardId}` : ''}/issues${id ? `/${id}` : ''}`; + return `${gon.relative_url_root}/-/boards/${boardId ? `${boardId}` : ''}/issues${id ? `/${id}` : ''}`; } all() { diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 76bb53eaf2..c3f38c9ca1 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -292,10 +292,12 @@ Please check your network connection and try again.`;