From 4dfb7853ebd0ba1c49fd8d69c2f93bb0c7a7c0da Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 19 Feb 2019 20:26:58 +0000 Subject: [PATCH 1/5] Merge branch '57798-fix-auto-devops-empty-str-check' into 'master' Fix Auto DevOps check domain is blank Closes #57798 See merge request gitlab-org/gitlab-ce!25308 (cherry picked from commit 8a16c07dd82ac7cb84f99e2f4d0a3e2b5b118fbf) 2d300104 Fix Auto DevOps check domain is blank --- .../unreleased/57798-fix-auto-devops-empty-str-check.yml | 5 +++++ lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/57798-fix-auto-devops-empty-str-check.yml diff --git a/changelogs/unreleased/57798-fix-auto-devops-empty-str-check.yml b/changelogs/unreleased/57798-fix-auto-devops-empty-str-check.yml new file mode 100644 index 00000000000..39d077350bb --- /dev/null +++ b/changelogs/unreleased/57798-fix-auto-devops-empty-str-check.yml @@ -0,0 +1,5 @@ +--- +title: Prevent Auto DevOps from trying to deploy without a domain name +merge_request: 25308 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index e369d26f22f..cb547cc2eaa 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -826,7 +826,7 @@ rollout 100%: # Function to ensure backwards compatibility with AUTO_DEVOPS_DOMAIN function ensure_kube_ingress_base_domain() { - if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then + if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN fi } -- GitLab From 043f7a8360343ab8e6fc21a41d02040b28c923e3 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 19 Feb 2019 14:37:00 +0000 Subject: [PATCH 2/5] Merge branch '57583-sticky-bar' into 'master' Fixes the top position of job log topbar Closes #57583 See merge request gitlab-org/gitlab-ce!25394 (cherry picked from commit 1aae24ce099c8683c9b212cceb1c1a71137c1c48) 91f12bc1 Fixes the top position of job log topbar --- app/assets/stylesheets/pages/builds.scss | 6 +++++- changelogs/unreleased/57583-sticky-bar.yml | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/57583-sticky-bar.yml diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 65f46e3852a..fa5a182243c 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -75,7 +75,11 @@ @include build-trace-top-bar(35px); &.has-archived-block { - top: $header-height + $performance-bar-height + 28px; + top: $header-height + 28px; + + .with-performance-bar & { + top: $header-height + $performance-bar-height + 28px; + } } &.affix { diff --git a/changelogs/unreleased/57583-sticky-bar.yml b/changelogs/unreleased/57583-sticky-bar.yml new file mode 100644 index 00000000000..c592343a409 --- /dev/null +++ b/changelogs/unreleased/57583-sticky-bar.yml @@ -0,0 +1,5 @@ +--- +title: Fixes archived sticky top bar without perfomance bar +merge_request: +author: +type: fixed -- GitLab From f1e2b02e2db5bae6631d9aa422806cdf399b43b4 Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Wed, 20 Feb 2019 13:46:22 +0000 Subject: [PATCH 3/5] Merge branch 'tn-quality-add_id_to_group_name' into 'master' Added id to namespace name generator See merge request gitlab-org/gitlab-ce!25285 (cherry picked from commit 9c7363db1fbf17c5e8ab68930932911352f94cb2) 0718bfe2 Added id to namespace a5def527 Apply suggestion to qa/qa/runtime/namespace.rb 94af2d69 Adding comment to check script 5b8e5a5b Apply suggestion to qa/qa/runtime/namespace.rb --- qa/qa/runtime/namespace.rb | 4 +++- .../3_create/merge_request/squash_merge_request_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb index 704c65467e0..9d7c1aea508 100644 --- a/qa/qa/runtime/namespace.rb +++ b/qa/qa/runtime/namespace.rb @@ -8,7 +8,9 @@ module QA end def name - Runtime::Env.namespace_name || "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}" + # If any changes are made to the name tag, following script has to be considered: + # https://ops.gitlab.net/gitlab-com/gl-infra/traffic-generator/blob/master/bin/janitor.bash + @name ||= Runtime::Env.namespace_name || "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(8)}" end def path diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index 545da0a8b85..bf20ff99a99 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -2,7 +2,7 @@ module QA # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31 - context 'Create', :quarantine do + context 'Create' do describe 'Merge request squashing' do it 'user squashes commits while merging' do Runtime::Browser.visit(:gitlab, Page::Main::Login) -- GitLab From 8b603ba905c1b278bf287b6e40048a55261fe585 Mon Sep 17 00:00:00 2001 From: Sanad Liaquat Date: Wed, 20 Feb 2019 15:08:46 +0000 Subject: [PATCH 4/5] Merge branch 'qa-ml-quarantine-push-over-http-file-size-spec' into 'master' Quarantine failing test See merge request gitlab-org/gitlab-ce!25424 (cherry picked from commit af2ebd71264fe08035e38b0c30a8603ac2e65f18) 89e982ad Quarantine failing test --- .../3_create/repository/push_over_http_file_size_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb index 23ea55c2e61..4d3ced60f6d 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module QA - context 'Create' do + # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/37 + context 'Create', :quarantine do describe 'push after setting the file size limit via admin/application_settings' do before(:all) do push = Resource::Repository::ProjectPush.fabricate! do |p| -- GitLab From cc2734f6373fb26885bb81666014ad2c08ae1f58 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 20 Feb 2019 16:13:43 +0000 Subject: [PATCH 5/5] Merge branch 'tr-update-gitlab-ui-2.0.4' into '11-8-stable' Update GitLab UI to latest version See merge request gitlab-org/gitlab-ce!25428 (cherry picked from commit d5ab93a655db04aa512e54cb62e3b48e50777744) 67b2203b Update GitLab UI to latest version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7110baef8b3..cc4edbfacd8 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.8.0", "@gitlab/svgs": "^1.51.0", - "@gitlab/ui": "^2.0.2", + "@gitlab/ui": "^2.0.4", "apollo-boost": "^0.1.20", "apollo-client": "^2.4.5", "autosize": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 9d0ba6640f0..550566bd252 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,10 +658,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.51.0.tgz#1b608f68dfb74284401b1cbdb823440f6e8b0091" integrity sha512-B1Wdhfy5ZClkHuaaCUUZyOBF8CFxxHqxGGhveRekOowtlMExa3tx+YkqNa5XPsEVMF6Aqnh8evQmmN4b+zrHVQ== -"@gitlab/ui@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.2.tgz#611571c931181fb783f57f712e1c2388059b301b" - integrity sha512-rUWVhWmM9EkwIEruYJEjizrQKe7TzNyKArwWY/nfEL4HptDtwbe+xHfR8IJHbpql3oI87cTO3BheMxYF6b2Ebg== +"@gitlab/ui@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.4.tgz#ba86f6e5868ef7bc7f504cef9ca504c2d2f6bffd" + integrity sha512-dJ+KKpeqIAPYZtYZeciXhC/whNiGPVRjp5IgjQRddh3zsreqmfwQq58nSH7HepAAIepaqTe0UFuzBgrSWvVM6w== dependencies: babel-standalone "^6.26.0" bootstrap-vue "^2.0.0-rc.11" -- GitLab