Automatic merge of gitlab-org/gitlab master

3edfab87 · GitLab Bot · 1e09abac · 0226a822 · 3edfab87 · 3edfab87
Commit 3edfab87 authored Feb 09, 2021 by GitLab Bot
93 changed files
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -5,7 +5,6 @@ module Pages
    include Gitlab::Utils::StrongMemoize
    LegacyStorageDisabledError = Class.new(::StandardError)
-    MIGRATED_FILE_NAME = "_migrated.zip"
    def initialize(project, trim_prefix: nil, domain: nil)
      @project = project
@@ -55,7 +54,7 @@ module Pages
      return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project)
-      return if deployment.file.filename == MIGRATED_FILE_NAME && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
+      return if deployment.migrated? && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
      global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s

--- a/app/models/pages_deployment.rb
+++ b/app/models/pages_deployment.rb
@@ -4,12 +4,15 @@
 class PagesDeployment < ApplicationRecord
  include FileStoreMounter
+  MIGRATED_FILE_NAME = "_migrated.zip"
  attribute :file_store, :integer, default: -> { ::Pages::DeploymentUploader.default_store }
  belongs_to :project, optional: false
  belongs_to :ci_build, class_name: 'Ci::Build', optional: true
  scope :older_than, -> (id) { where('id < ?', id) }
+  scope :migrated_from_legacy_storage, -> { where(file: MIGRATED_FILE_NAME) }
  validates :file, presence: true
  validates :file_store, presence: true, inclusion: { in: ObjectStorage::SUPPORTED_STORES }
@@ -25,6 +28,10 @@ class PagesDeployment < ApplicationRecord
    # this is to be adressed in https://gitlab.com/groups/gitlab-org/-/epics/589
  end
+  def migrated?
+    file.filename == MIGRATED_FILE_NAME
+  end
  private
  def set_size

--- a/app/views/projects/issues/import_csv/_button.html.haml
+++ b/app/views/projects/issues/import_csv/_button.html.haml
@@ -2,7 +2,7 @@
 - can_edit = can?(current_user, :admin_project, @project)
 .dropdown.btn-group
-  %button.btn.gl-button.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
+  %button.btn.gl-button.btn-default.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
    data: { toggle: 'dropdown', qa_selector: 'import_issues_button' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
    - if type == :icon
      = sprite_icon('import')

--- a/app/views/shared/empty_states/_issues.html.haml
+++ b/app/views/shared/empty_states/_issues.html.haml
@@ -42,7 +42,7 @@
            - if project_select_button
              = render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues'
            - else
-              = link_to _('New issue'), button_path, class: 'btn btn-success', id: 'new_issue_link'
+              = link_to _('New issue'), button_path, class: 'btn gl-button btn-success', id: 'new_issue_link'
            - if show_import_button
              = render 'projects/issues/import_csv/button', type: :text

--- a/changelogs/unreleased/gl-button-empty-issue-placeholder.yml
+++ b/changelogs/unreleased/gl-button-empty-issue-placeholder.yml
+---
+title: Apply new GitLab UI for buttons in empty issue placeholder
+merge_request: 53554
+author: Yogi (@yo)
+type: other
--- a/doc/administration/file_hooks.md
+++ b/doc/administration/file_hooks.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# File hooks
+# File hooks **(FREE)**
 > - Introduced in GitLab 10.6.
 > - Until GitLab 12.8, the feature name was Plugins.

--- a/doc/administration/git_protocol.md
+++ b/doc/administration/git_protocol.md
@@ -6,7 +6,7 @@ type: reference
 description: "Set and configure Git protocol v2"
 ---
-# Configuring Git Protocol v2
+# Configuring Git Protocol v2 **(FREE)**
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/46555) in GitLab 11.4.
 > - [Temporarily disabled](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55769) in GitLab 11.5.8, 11.6.6, 11.7.1, and 11.8+.

--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# PlantUML & GitLab
+# PlantUML & GitLab **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8537) in GitLab 8.16.

--- a/doc/administration/invalidate_markdown_cache.md
+++ b/doc/administration/invalidate_markdown_cache.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Invalidate Markdown Cache
+# Invalidate Markdown Cache **(FREE)**
 For performance reasons, GitLab caches the HTML version of Markdown text
 in fields like comments, issue descriptions, and merge request descriptions. These

--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Branches API
+# Branches API **(FREE)**
 This API operates on [repository branches](../user/project/repository/branches/index.md).

--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Commits API
+# Commits API **(FREE)**
 ## List repository commits

--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, api
 ---
-# Discussions API
+# Discussions API **(FREE)**
 Discussions are a set of related notes on:

--- a/doc/api/keys.md
+++ b/doc/api/keys.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Keys API
+# Keys API **(FREE)**
 ## Get SSH key with user by ID of an SSH key

--- a/doc/api/markdown.md
+++ b/doc/api/markdown.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Markdown API
+# Markdown API **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18926) in GitLab 11.0.

--- a/doc/api/merge_request_context_commits.md
+++ b/doc/api/merge_request_context_commits.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Merge request context commits API
+# Merge request context commits API **(FREE)**
 ## List MR context commits

--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Merge requests API
+# Merge requests API **(FREE)**
 > - `author_id`, `author_username`, and `assignee_id` were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 9.5.
 > - `my_reaction_emoji` was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14016) in GitLab 10.0.

--- a/doc/api/project_badges.md
+++ b/doc/api/project_badges.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Project badges API
+# Project badges API **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17082) in GitLab 10.6.

--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Project import/export API
+# Project import/export API **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41899) in GitLab 10.6.

--- a/doc/api/project_statistics.md
+++ b/doc/api/project_statistics.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Project statistics API
+# Project statistics API **(FREE)**
 Every API call to [project](../user/project/index.md) statistics must be authenticated.

--- a/doc/api/project_templates.md
+++ b/doc/api/project_templates.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Project templates API
+# Project templates API **(FREE)**
 This API is a project-specific version of these endpoints:

--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Protected branches API
+# Protected branches API **(FREE)**
 > Introduced in GitLab 9.5.

--- a/doc/api/protected_tags.md
+++ b/doc/api/protected_tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Protected tags API
+# Protected tags API **(FREE)**
 > Introduced in GitLab 11.3.

--- a/doc/api/remote_mirrors.md
+++ b/doc/api/remote_mirrors.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Project remote mirrors API
+# Project remote mirrors API **(FREE)**
 [Push mirrors](../user/project/repository/repository_mirroring.md#pushing-to-a-remote-repository)
 defined on a project's repository settings are called "remote mirrors", and the

--- a/doc/api/repository_files.md
+++ b/doc/api/repository_files.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Repository files API
+# Repository files API **(FREE)**
 **CRUD for repository files**

--- a/doc/api/repository_submodules.md
+++ b/doc/api/repository_submodules.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Repository submodules API
+# Repository submodules API **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41213) in GitLab 11.5

--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Search API
+# Search API **(FREE)**
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41763) in GitLab 10.5.
 > - [Feature flag `search_filter_by_confidential` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/244923) in GitLab 13.6.

--- a/doc/api/suggestions.md
+++ b/doc/api/suggestions.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Suggest Changes API
+# Suggest Changes API **(FREE)**
 Every API call to suggestions must be authenticated.

--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Tags API
+# Tags API **(FREE)**
 ## List project repository tags

--- a/doc/development/approval_rules.md
+++ b/doc/development/approval_rules.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
-# Approval Rules development guide
+# Approval Rules development guide **(FREE)**
 This document explains the backend design and flow of all related functionality
 about [merge request approval rules](../user/project/merge_requests/merge_request_approvals.md).

--- a/doc/development/code_intelligence/index.md
+++ b/doc/development/code_intelligence/index.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
-# Code Intelligence
+# Code Intelligence **(FREE)**
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.

--- a/doc/development/internal_api.md
+++ b/doc/development/internal_api.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
-# Internal API
+# Internal API **(FREE)**
 The internal API is used by different GitLab components, it can not be
 used by other consumers. This documentation is intended for people

--- a/doc/development/lfs.md
+++ b/doc/development/lfs.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
-# Git LFS
+# Git LFS **(FREE)**
 ## Deep Dive

--- a/doc/development/new_fe_guide/modules/widget_extensions.md
+++ b/doc/development/new_fe_guide/modules/widget_extensions.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
-# Merge request widget extensions
+# Merge request widget extensions **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44616) in GitLab 13.6.

--- a/doc/gitlab-basics/README.md
+++ b/doc/gitlab-basics/README.md
@@ -6,7 +6,7 @@ comments: false
 type: index
 ---
-# GitLab basics guides
+# GitLab basics guides **(FREE)**
 This section provides resources to help you start working with GitLab and Git by focusing
 on the basic features that you will need to use.

--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
-# Add a file to a repository
+# Add a file to a repository **(FREE)**
 Adding files to a repository is a small, but key task. Bringing files in to a repository,
 such as code, images, or documents, allows them to be tracked by Git, even though they

--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto, reference
 ---
-# Edit files through the command line
+# Edit files through the command line **(FREE)**
 When [working with Git from the command line](start-using-git.md), you need to
 use more than just the Git commands. There are several basic commands that you should

--- a/doc/gitlab-basics/create-branch.md
+++ b/doc/gitlab-basics/create-branch.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
-# How to create a branch
+# How to create a branch **(FREE)**
 A branch is an independent line of development in a [project](../user/project/index.md).

--- a/doc/gitlab-basics/feature_branch_workflow.md
+++ b/doc/gitlab-basics/feature_branch_workflow.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
 ---
-# Feature branch workflow
+# Feature branch workflow **(FREE)**
 1. Clone project:

--- a/doc/gitlab-basics/start-using-git.md
+++ b/doc/gitlab-basics/start-using-git.md
@@ -6,7 +6,7 @@ type: howto, tutorial
 description: "Introduction to using Git through the command line."
 ---
-# Start using Git on the command line
+# Start using Git on the command line **(FREE)**
 [Git](https://git-scm.com/) is an open-source distributed version control system designed to
 handle everything from small to very large projects with speed and efficiency. GitLab is built

--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, how-to
 ---
-# Sourcegraph integration
+# Sourcegraph integration **(FREE)**
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5.
 > - Note that this integration is in BETA and deployed [behind a feature flag](#enable-the-sourcegraph-feature-flag) disabled by default. Self-managed instances can opt to enable it.

--- a/doc/intro/README.md
+++ b/doc/intro/README.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 comments: false
 ---
-# Get started with GitLab
+# Get started with GitLab **(FREE)**
 ## Organize

--- a/doc/topics/git/feature_branch_development.md
+++ b/doc/topics/git/feature_branch_development.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: how-tos
 ---
-# Develop on a feature branch
+# Develop on a feature branch **(FREE)**
 GitLab values encourage the use of [Minimal Viable Change (MVC)](https://about.gitlab.com/handbook/values/#minimal-viable-change-mvc).
 However, viable changes are not always small. In such cases, it can help to set up a dedicated feature branch.

--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -6,7 +6,7 @@ type: concepts, howto
 description: "Introduction to Git rebase, force-push, and resolving merge conflicts through the command line."
 ---
-# Introduction to Git rebase, force-push, and merge conflicts
+# Introduction to Git rebase, force-push, and merge conflicts **(FREE)**
 This guide helps you to get started with rebasing, force-pushing, and fixing
 merge conflicts locally.

--- a/doc/topics/git/how_to_install_git/index.md
+++ b/doc/topics/git/how_to_install_git/index.md
@@ -6,7 +6,7 @@ description: 'This article describes how to install Git on macOS, Ubuntu Linux a
 type: howto
 ---
-# Installing Git
+# Installing Git **(FREE)**
 To begin contributing to GitLab projects,
 you will need to install the Git client on your computer.

--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: index
 ---
-# Git
+# Git **(FREE)**
 Git is a [free and open source](https://git-scm.com/about/free-and-open-source)
 distributed version control system designed to handle everything from small to

--- a/doc/topics/git/lfs/index.md
+++ b/doc/topics/git/lfs/index.md
@@ -6,7 +6,7 @@ type: reference, howto
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/lfs/lfs/index.html'
 ---
-# Git Large File Storage (LFS)
+# Git Large File Storage (LFS) **(FREE)**
 Managing large files such as audio, video and graphics files has always been one
 of the shortcomings of Git. The general recommendation is to not have Git repositories

--- a/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
+++ b/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Migration guide from Git Annex to Git LFS
+# Migration guide from Git Annex to Git LFS **(FREE)**
 WARNING:
 Git Annex support [has been removed](https://gitlab.com/gitlab-org/gitlab/-/issues/1648) in GitLab Enterprise

--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: howto
 ---
-# Numerous undo possibilities in Git
+# Numerous undo possibilities in Git **(FREE)**
 This tutorial shows you different ways of undoing your work in Git.
 We assume you have a basic working knowledge of Git. Check the GitLab

--- a/doc/topics/git/partial_clone.md
+++ b/doc/topics/git/partial_clone.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Partial Clone
+# Partial Clone **(FREE)**
 As Git repositories grow in size, they can become cumbersome to work with
 because of the large amount of history that must be downloaded, and the large

--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
-# Troubleshooting Git
+# Troubleshooting Git **(FREE)**
 Sometimes things don't work the way they should or as you might expect when
 you're using Git. Here are some tips on troubleshooting and resolving issues

--- a/doc/topics/git/useful_git_commands.md
+++ b/doc/topics/git/useful_git_commands.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Useful Git commands
+# Useful Git commands **(FREE)**
 The GitLab support team has collected these commands to help you. You may not
 need to use them often.

--- a/doc/topics/gitlab_flow.md
+++ b/doc/topics/gitlab_flow.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/gitlab_flow.html'
 ---
-# Introduction to GitLab Flow
+# Introduction to GitLab Flow **(FREE)**
 ![GitLab Flow](img/gitlab_flow.png)

--- a/doc/user/admin_area/settings/instance_template_repository.md
+++ b/doc/user/admin_area/settings/instance_template_repository.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Instance template repository **(PREMIUM SELF)**
+# Instance template repository **(PREMIUM SELF)** **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5986) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.3.

--- a/doc/user/admin_area/settings/push_event_activities_limit.md
+++ b/doc/user/admin_area/settings/push_event_activities_limit.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Push event activities limit and bulk push events
+# Push event activities limit and bulk push events **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4.

--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# AsciiDoc
+# AsciiDoc **(FREE)**
 GitLab uses the [Asciidoctor](https://asciidoctor.org) gem to convert AsciiDoc content to HTML5.
 Consult the [Asciidoctor User Manual](https://asciidoctor.org/docs/user-manual/) for a complete Asciidoctor reference.

--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Threads
+# Threads **(FREE)**
 The ability to contribute conversationally is offered throughout GitLab.

--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# GitLab Markdown
+# GitLab Markdown **(FREE)**
 This Markdown guide is **valid only for the GitLab internal Markdown rendering system for entries and files**.
 It is **not** valid for the [GitLab documentation website](https://docs.gitlab.com)

--- a/doc/user/profile/account/create_accounts.md
+++ b/doc/user/profile/account/create_accounts.md
@@ -37,3 +37,5 @@ Users will be:
 - Automatically created upon first sign in with the [LDAP integration](../../../administration/auth/ldap/index.md).
 - Created when first signing in via an [OmniAuth provider](../../../integration/omniauth.md) if the `allow_single_sign_on` setting is present.
+- Created when first signing with [Group SAML](../../group/saml_sso/index.md)
+- Automatically created by [SCIM](../../group/saml_sso/scim_setup.md) when the user is created in the identity provider.
--- a/doc/user/project/autocomplete_characters.md
+++ b/doc/user/project/autocomplete_characters.md
@@ -6,7 +6,7 @@ type: reference
 description: "Autocomplete chars in Markdown fields."
 ---
-# Autocomplete characters
+# Autocomplete characters **(FREE)**
 The autocomplete characters provide a quick way of entering field values into
 Markdown fields. When you start typing a word in a Markdown field with one of

--- a/doc/user/project/badges.md
+++ b/doc/user/project/badges.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Badges
+# Badges **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41174) in GitLab 10.7.

--- a/doc/user/project/code_intelligence.md
+++ b/doc/user/project/code_intelligence.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Code Intelligence
+# Code Intelligence **(FREE)**
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.

--- a/doc/user/project/git_attributes.md
+++ b/doc/user/project/git_attributes.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Git Attributes
+# Git Attributes **(FREE)**
 GitLab supports defining custom [Git attributes](https://git-scm.com/docs/gitattributes) such as what
 files to treat as binary, and what language to use for syntax highlighting

--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Syntax Highlighting
+# Syntax Highlighting **(FREE)**
 GitLab provides syntax highlighting on all files through the [Rouge](https://rubygems.org/gems/rouge) Ruby gem. It attempts to guess what language to use based on the file extension, which most of the time is sufficient.

--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
-# Projects
+# Projects **(FREE)**
 In GitLab, you can create projects for hosting
 your codebase, use it as an issue tracker, collaborate on code, and continuously

--- a/doc/user/project/merge_requests/allow_collaboration.md
+++ b/doc/user/project/merge_requests/allow_collaboration.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, howto
 ---
-# Allow collaboration on merge requests across forks
+# Allow collaboration on merge requests across forks **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17395) in GitLab 10.6.

--- a/doc/user/project/merge_requests/authorization_for_merge_requests.md
+++ b/doc/user/project/merge_requests/authorization_for_merge_requests.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: concepts
 ---
-# Authorization for Merge requests
+# Authorization for Merge requests **(FREE)**
 There are two main ways to have a merge request flow with GitLab:

--- a/doc/user/project/merge_requests/cherry_pick_changes.md
+++ b/doc/user/project/merge_requests/cherry_pick_changes.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Cherry-pick changes
+# Cherry-pick changes **(FREE)**
 GitLab implements Git's powerful feature to
 [cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation")

--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -7,7 +7,7 @@ description: "How to create Merge Requests in GitLab."
 disqus_identifier: 'https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html'
 ---
-# How to create a merge request
+# How to create a merge request **(FREE)**
 Before creating a merge request, read through an
 [introduction to Merge Requests](getting_started.md)

--- a/doc/user/project/merge_requests/fast_forward_merge.md
+++ b/doc/user/project/merge_requests/fast_forward_merge.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Fast-forward merge requests
+# Fast-forward merge requests **(FREE)**
 Sometimes, a workflow policy might mandate a clean commit history without
 merge commits. In such cases, the fast-forward merge is the perfect candidate.

--- a/doc/user/project/merge_requests/getting_started.md
+++ b/doc/user/project/merge_requests/getting_started.md
@@ -6,7 +6,7 @@ type: index, reference
 description: "Getting started with Merge Requests."
 ---
-# Getting started with Merge Requests
+# Getting started with Merge Requests **(FREE)**
 A Merge Request (**MR**) is the basis of GitLab as a code
 collaboration and version control.

--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
-# Merge requests
+# Merge requests **(FREE)**
 A Merge Request (**MR**) is a _request_ to _merge_ one branch into another.

--- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Merge when pipeline succeeds
+# Merge when pipeline succeeds **(FREE)**
 When reviewing a merge request that looks ready to merge but still has a
 pipeline running, you can set it to merge automatically when the

--- a/doc/user/project/merge_requests/resolve_conflicts.md
+++ b/doc/user/project/merge_requests/resolve_conflicts.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Merge request conflict resolution
+# Merge request conflict resolution **(FREE)**
 Merge conflicts occur when two branches have different changes that cannot be
 merged automatically.

--- a/doc/user/project/merge_requests/revert_changes.md
+++ b/doc/user/project/merge_requests/revert_changes.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Reverting changes
+# Reverting changes **(FREE)**
 You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
 by clicking the **Revert** button in merge requests and commit details.

--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
-# Squash and merge
+# Squash and merge **(FREE)**
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1024) in [GitLab Starter](https://about.gitlab.com/pricing/) 8.17.
 > - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18956) from [GitLab Starter](https://about.gitlab.com/pricing/)to GitLab Free in 11.0.

--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Protected branches
+# Protected branches **(FREE)**
 [Permissions](../permissions.md) in GitLab are fundamentally defined around the
 idea of having read or write permission to the repository and branches. To impose

--- a/doc/user/project/protected_tags.md
+++ b/doc/user/project/protected_tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Protected tags
+# Protected tags **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10356) in GitLab 9.1.

--- a/doc/user/project/push_options.md
+++ b/doc/user/project/push_options.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
-# Push Options
+# Push Options **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/15643) in GitLab 11.7.

--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
-# Branches
+# Branches **(FREE)**
 A branch is a version of a project's working tree. You create a branch for each
 set of related changes you make. This keeps each set of changes separate from

--- a/doc/user/project/repository/forking_workflow.md
+++ b/doc/user/project/repository/forking_workflow.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/forking_workflow.html'
 ---
-# Project forking workflow
+# Project forking workflow **(FREE)**
 Whenever possible, it's recommended to work in a common Git repository and use
 [branching strategies](../../../topics/gitlab_flow.md) to manage your work. However,

--- a/doc/user/project/repository/git_blame.md
+++ b/doc/user/project/repository/git_blame.md
@@ -6,7 +6,7 @@ type: reference, howto
 description: "Documentation on Git file blame."
 ---
-# Git file blame
+# Git file blame **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/commit/39c657930625ddc3ac8a921f01ffc83acadce68f) in GitLab 2.5.

--- a/doc/user/project/repository/git_history.md
+++ b/doc/user/project/repository/git_history.md
@@ -6,7 +6,7 @@ type: reference, howto
 description: "Documentation on Git file history."
 ---
-# Git file history
+# Git file history **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/blob/9ba1224867665844b117fa037e1465bb706b3685/app/controllers/commits_controller.rb) in GitLab 0.8.0

--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ b/doc/user/project/repository/gpg_signed_commits/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
-# Signing commits with GPG
+# Signing commits with GPG **(FREE)**
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546) in GitLab 9.5.
 > - Subkeys support was added in GitLab 10.1.

--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: concepts, howto
 ---
-# Repository
+# Repository **(FREE)**
 A [repository](https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository)
 is what you use to store your codebase in GitLab and change it with version control.

--- a/doc/user/project/repository/jupyter_notebooks/index.md
+++ b/doc/user/project/repository/jupyter_notebooks/index.md
@@ -4,7 +4,7 @@ group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
 type: reference
 ---
-# Jupyter Notebook Files
+# Jupyter Notebook Files **(FREE)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/2508/) in GitLab 9.1.

--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/repository_mirroring.html'
 ---
-# Repository mirroring
+# Repository mirroring **(FREE)**
 Repository mirroring allows for mirroring of repositories to and from external sources. It can be
 used to mirror branches, tags, and commits between repositories. It is useful when you want to use

--- a/doc/user/project/repository/x509_signed_commits/index.md
+++ b/doc/user/project/repository/x509_signed_commits/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
-# Signing commits and tags with X.509
+# Signing commits and tags with X.509 **(FREE)**
 [X.509](https://en.wikipedia.org/wiki/X.509) is a standard format for public key
 certificates issued by a public or private Public Key Infrastructure (PKI).

--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, index, howto
 ---
-# Project settings
+# Project settings **(FREE)**
 NOTE:
 Only project maintainers and administrators have the [permissions](../../permissions.md#project-members-permissions)

--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -4,7 +4,7 @@ group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
 ---
-# Working with projects
+# Working with projects **(FREE)**
 Most work in GitLab is done in a [project](../../user/project/index.md). Files and
 code are saved in projects, and most features are in the scope of projects.

--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -64,7 +64,7 @@ module Gitlab
      end
      def self.validate_build_dependencies?(project)
-        ::Feature.enabled?(:ci_validate_build_dependencies, default_enabled: :yaml) &&
+        ::Feature.enabled?(:ci_validate_build_dependencies, project, default_enabled: :yaml) &&
          ::Feature.disabled?(:ci_validate_build_dependencies_override, project)
      end

--- a/spec/models/pages/lookup_path_spec.rb
+++ b/spec/models/pages/lookup_path_spec.rb
@@ -124,22 +124,12 @@ RSpec.describe Pages::LookupPath do
        include_examples 'uses disk storage'
      end
-    end
      context 'when deployment were created during migration' do
        before do
-        FileUtils.mkdir_p File.join(project.pages_path, "public")
+          allow(deployment).to receive(:migrated?).and_return(true)
-        File.open(File.join(project.pages_path, "public/index.html"), "w") do |f|
-          f.write("Hello!")
-        end
-        expect(::Pages::MigrateLegacyStorageToDeploymentService.new(project).execute[:status]).to eq(:success)
-        project.reload
        end
-      let(:deployment) { project.pages_metadatum.pages_deployment }
        it 'uses deployment from object storage' do
          freeze_time do
            expect(source).to(
@@ -164,6 +154,7 @@ RSpec.describe Pages::LookupPath do
        end
      end
    end
+  end
  describe '#prefix' do
    it 'returns "/" for pages group root projects' do

--- a/spec/models/pages_deployment_spec.rb
+++ b/spec/models/pages_deployment_spec.rb
@@ -26,6 +26,46 @@ RSpec.describe PagesDeployment do
    end
  end
+  describe '.migrated_from_legacy_storage' do
+    it 'only returns migrated deployments' do
+      project = create(:project)
+      migrated_deployment = create_migrated_deployment(project)
+      # create one other deployment
+      create(:pages_deployment, project: project)
+      expect(described_class.migrated_from_legacy_storage).to eq([migrated_deployment])
+    end
+  end
+  describe '#migrated?' do
+    it 'returns false for normal deployment' do
+      deployment = create(:pages_deployment)
+      expect(deployment.migrated?).to eq(false)
+    end
+    it 'returns true for migrated deployment' do
+      project = create(:project)
+      deployment = create_migrated_deployment(project)
+      expect(deployment.migrated?).to eq(true)
+    end
+  end
+  def create_migrated_deployment(project)
+    public_path = File.join(project.pages_path, "public")
+    FileUtils.mkdir_p(public_path)
+    File.open(File.join(project.pages_path, "public/index.html"), "w") do |f|
+      f.write("Hello!")
+    end
+    expect(::Pages::MigrateLegacyStorageToDeploymentService.new(project).execute[:status]).to eq(:success)
+    project.reload.pages_metadatum.pages_deployment
+  ensure
+    FileUtils.rm_rf(public_path)
+  end
  describe 'default for file_store' do
    let(:project) { create(:project) }
    let(:deployment) do

--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -474,6 +474,22 @@ module Ci
          end
          it_behaves_like 'validation is active'
+          context 'when the main feature flag is enabled for a specific project' do
+            before do
+              stub_feature_flags(ci_validate_build_dependencies: pipeline.project)
+            end
+            it_behaves_like 'validation is active'
+          end
+          context 'when the main feature flag is enabled for a different project' do
+            before do
+              stub_feature_flags(ci_validate_build_dependencies: create(:project))
+            end
+            it_behaves_like 'validation is not active'
+          end
        end
        context 'when validates for dependencies is disabled' do