From b52b15043b3fdc9c0efe58c687a362eb0a75bdf9 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 1 May 2018 15:08:00 +0530 Subject: [PATCH] New upstream version 10.6.5+dfsg --- .gitlab-ci.yml | 2 +- CHANGELOG.md | 25 + VERSION | 2 +- .../boards/services/board_service.js | 2 +- .../notes/components/noteable_discussion.vue | 6 +- .../components/promote_milestone_modal.vue | 8 +- .../shared/promote_milestone_modal_init.js | 2 + .../labels/components/promote_label_modal.vue | 17 +- .../pages/projects/labels/index/index.js | 2 + .../sidebar/lib/sidebar_move_issue.js | 4 +- app/assets/stylesheets/framework/modal.scss | 6 + app/controllers/projects/labels_controller.rb | 2 +- .../projects/milestones_controller.rb | 4 +- app/models/clusters/cluster.rb | 2 + app/models/concerns/deployment_platform.rb | 22 +- app/services/boards/issues/move_service.rb | 5 +- app/services/issues/update_service.rb | 17 +- app/services/projects/update_pages_service.rb | 22 +- app/services/verify_pages_domain_service.rb | 10 +- app/views/projects/milestones/show.html.haml | 1 + app/views/shared/_label.html.haml | 1 + app/views/shared/_recaptcha_form.html.haml | 2 +- .../shared/milestones/_milestone.html.haml | 1 + doc/ci/examples/code_climate.md | 7 +- lib/banzai/filter/autolink_filter.rb | 8 +- .../migrate_build_stage.rb | 1 + lib/gitlab/git/repository.rb | 3 +- .../projects/clusters_controller_spec.rb | 4 +- .../projects/milestones_controller_spec.rb | 2 +- spec/factories/clusters/clusters.rb | 4 + spec/features/issues/spam_issues_spec.rb | 3 - spec/finders/clusters_finder_spec.rb | 2 +- .../components/noteable_discussion_spec.js | 16 +- .../components/promote_label_modal_spec.js | 3 +- .../promote_milestone_modal_spec.js | 3 +- spec/javascripts/sidebar/mock_data.js | 2 +- .../sidebar/sidebar_move_issue_spec.js | 9 + .../lib/banzai/filter/autolink_filter_spec.rb | 9 + .../migrate_build_stage_spec.rb | 16 + spec/lib/gitlab/git/repository_spec.rb | 5 +- spec/presenters/project_presenter_spec.rb | 2 +- .../boards/issues/move_service_spec.rb | 2 +- spec/services/clusters/create_service_spec.rb | 2 +- spec/services/issues/update_service_spec.rb | 31 + .../projects/update_pages_service_spec.rb | 40 +- .../verify_pages_domain_service_spec.rb | 19 + spec/support/migrations_helpers.rb | 5 +- .../services/boards/issues_move_service.rb | 15 +- vendor/assets/javascripts/jquery.atwho.js | 1202 + vendor/assets/javascripts/jquery.caret.js | 436 + vendor/assets/javascripts/pdf.js | 9365 ++++ vendor/assets/javascripts/pdf.min.js | 6 + vendor/assets/javascripts/pdf.worker.js | 38338 ++++++++++++++++ vendor/assets/javascripts/pdf.worker.min.js | 19 + vendor/assets/javascripts/xterm/xterm.js | 2235 + vendor/prometheus/values.yaml | 1 + 56 files changed, 51909 insertions(+), 71 deletions(-) create mode 100644 vendor/assets/javascripts/jquery.atwho.js create mode 100644 vendor/assets/javascripts/jquery.caret.js create mode 100755 vendor/assets/javascripts/pdf.js create mode 100755 vendor/assets/javascripts/pdf.min.js create mode 100755 vendor/assets/javascripts/pdf.worker.js create mode 100755 vendor/assets/javascripts/pdf.worker.min.js create mode 100644 vendor/assets/javascripts/xterm/xterm.js 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.`;
+ role="group" + >
{ const modalProps = { milestoneTitle: button.dataset.milestoneTitle, url: button.dataset.url, + groupName: button.dataset.groupName, }; eventHub.$once('promoteMilestoneModal.requestStarted', onRequestStarted); eventHub.$emit('promoteMilestoneModal.props', modalProps); @@ -54,6 +55,7 @@ export default () => { return { modalProps: { milestoneTitle: '', + groupName: '', url: '', }, }; diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue index 54695dfeb9..ad6df51bb7 100644 --- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue +++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue @@ -1,4 +1,5 @@