From 4292486402affae3a8e8ef9845eb4202a4a36abf Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 29 Mar 2019 20:17:32 +0000 Subject: [PATCH 1/2] Merge branch 'leipert-hotfix-ci-yml' into 'master' Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777 (cherry picked from commit 65f2ed1de20abbb31b18524004164f1de3de4194) 23618d91 Fix GitLab CI branch matching pattern --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f33e47a7234..8ac10dfa7be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -244,8 +244,8 @@ package-and-qa: - ./scripts/trigger-build omnibus when: manual only: - - //@gitlab-org/gitlab-ce - - //@gitlab-org/gitlab-ee + - /.+/@gitlab-org/gitlab-ce + - /.+/@gitlab-org/gitlab-ee # Review docs base .review-docs: &review-docs @@ -675,10 +675,10 @@ gitlab:assets:compile: - public/assets/ <<: *assets-compile-cache only: - - //@gitlab-org/gitlab-ce - - //@gitlab-org/gitlab-ee - - //@gitlab/gitlabhq - - //@gitlab/gitlab-ee + - /.+/@gitlab-org/gitlab-ce + - /.+/@gitlab-org/gitlab-ee + - /.+/@gitlab/gitlabhq + - /.+/@gitlab/gitlab-ee tags: - docker - gitlab-org @@ -997,7 +997,7 @@ no_ee_check: script: - scripts/no-ee-check only: - - //@gitlab-org/gitlab-ce + - /.+/@gitlab-org/gitlab-ce # GitLab Review apps .review-build-cng-base: &review-build-cng-base -- GitLab From df2c6ccb10139ec1348c56e176d89de143a7dd4b Mon Sep 17 00:00:00 2001 From: John T Skarbek Date: Wed, 3 Apr 2019 12:48:44 -0400 Subject: [PATCH 2/2] Revert "Update CHANGELOG.md for 11.9.5" This reverts commit 15657f6ff77552f58988b76838408737218d5b1c. --- CHANGELOG.md | 11 +---------- .../unreleased/recreate-all-diffs-on-import.yml | 5 +++++ .../sh-fix-project-branches-merge-status.yml | 5 +++++ changelogs/unreleased/sh-fix-rugged-tree-entries.yml | 5 +++++ changelogs/unreleased/sh-force-gc-after-import.yml | 5 +++++ 5 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 changelogs/unreleased/recreate-all-diffs-on-import.yml create mode 100644 changelogs/unreleased/sh-fix-project-branches-merge-status.yml create mode 100644 changelogs/unreleased/sh-fix-rugged-tree-entries.yml create mode 100644 changelogs/unreleased/sh-force-gc-after-import.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 15d6a0647a1..f02377ab3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,7 @@ entry. ## 11.9.5 (2019-04-03) -### Fixed (3 changes) - -- Force to recreate all MR diffs on import. !26480 -- Fix API /project/:id/branches not returning correct merge status. !26785 -- Avoid excessive recursive calls with Rugged TreeEntries. !26813 - -### Performance (1 change) - -- Force a full GC after importing a project. !26803 - +- Unreleased due to QA failure. ## 11.9.4 (2019-03-28) diff --git a/changelogs/unreleased/recreate-all-diffs-on-import.yml b/changelogs/unreleased/recreate-all-diffs-on-import.yml new file mode 100644 index 00000000000..fd9124372f3 --- /dev/null +++ b/changelogs/unreleased/recreate-all-diffs-on-import.yml @@ -0,0 +1,5 @@ +--- +title: Force to recreate all MR diffs on import +merge_request: 26480 +author: +type: fixed diff --git a/changelogs/unreleased/sh-fix-project-branches-merge-status.yml b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml new file mode 100644 index 00000000000..65f41b3faf9 --- /dev/null +++ b/changelogs/unreleased/sh-fix-project-branches-merge-status.yml @@ -0,0 +1,5 @@ +--- +title: Fix API /project/:id/branches not returning correct merge status +merge_request: 26785 +author: +type: fixed diff --git a/changelogs/unreleased/sh-fix-rugged-tree-entries.yml b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml new file mode 100644 index 00000000000..97b27678905 --- /dev/null +++ b/changelogs/unreleased/sh-fix-rugged-tree-entries.yml @@ -0,0 +1,5 @@ +--- +title: Avoid excessive recursive calls with Rugged TreeEntries +merge_request: 26813 +author: +type: fixed diff --git a/changelogs/unreleased/sh-force-gc-after-import.yml b/changelogs/unreleased/sh-force-gc-after-import.yml new file mode 100644 index 00000000000..755d66c1607 --- /dev/null +++ b/changelogs/unreleased/sh-force-gc-after-import.yml @@ -0,0 +1,5 @@ +--- +title: Force a full GC after importing a project +merge_request: 26803 +author: +type: performance -- GitLab