Commit 1912bad6 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch '11-8-stable-prepare-rc9' into '11-8-stable'

Prepare 11.8.0-rc9 release

See merge request gitlab-org/gitlab-ce!25425
parents d5ab93a6 cc2734f6
......@@ -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 {
......
---
title: Fixes archived sticky top bar without perfomance bar
merge_request:
author:
type: fixed
---
title: Prevent Auto DevOps from trying to deploy without a domain name
merge_request: 25308
author:
type: fixed
......@@ -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
}
......
......@@ -8,7 +8,9 @@ def time
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
......
......@@ -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)
......
# 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|
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment