Automatic merge of gitlab-org/gitlab-ce master

qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Manage' do
+  # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/45
+  context 'Manage', :quarantine do
     describe 'Add project member' do
       it 'user adds project member' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)

scripts/build_assets_image

@@ -27,3 +27,9 @@ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
 docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG}
 docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA}
 
+# Also tag the image with GitLab version, if running on a tag pipeline, so
+# other projects can simply use that instead of computing the slug.
+if [ -n "$CI_COMMIT_TAG" ]; then
+    docker tag ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME}
+    docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME}
+fi

scripts/trigger-build

@@ -141,7 +141,7 @@ module Trigger
         "GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'],
         "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'],
         "GITLAB_TAG" => ENV['CI_COMMIT_TAG'],
-        "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_REF_SLUG'],
+        "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'],
         "#{edition}_PIPELINE" => 'true'
       }
     end