From 8815322e95fc522f7763a8bce68d461cd62b30b8 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 28 Mar 2019 10:31:56 +0000 Subject: [PATCH 1/2] Merge branch 'remove-cng-job' into 'master' Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605 (cherry picked from commit 04496085c1b83ccf5d9bfa546daf2a92e9c644e7) a1912444 Make cloud release job manual, as a fallback --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45de5ce61c6..f85edcd74df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -315,7 +315,7 @@ cloud-native-image: variables: GIT_DEPTH: "1" cache: {} - when: always + when: manual script: - gem install gitlab --no-document - CNG_PROJECT_PATH="gitlab-org/build/CNG" BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN ./scripts/trigger-build cng -- GitLab From f6a5951a97d4e3feeaa44fb656c2abc7223094fc Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 23 Apr 2019 15:07:48 +0200 Subject: [PATCH 2/2] Remove ee changelog wrong cherry-pick --- ee/changelogs/unreleased/security-milestone-labels.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 ee/changelogs/unreleased/security-milestone-labels.yml diff --git a/ee/changelogs/unreleased/security-milestone-labels.yml b/ee/changelogs/unreleased/security-milestone-labels.yml deleted file mode 100644 index 4f8abcbc8be..00000000000 --- a/ee/changelogs/unreleased/security-milestone-labels.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Check label_ids parent when updating issue board -merge_request: -author: -type: security -- GitLab