Add latest changes from gitlab-org/gitlab@master

12 files changed, 51 insertions, 5 deletions

diff --git a/app/assets/javascripts/ci_lint/components/ci_lint.vue b/app/assets/javascripts/ci_lint/components/ci_lint.vue
index d541e89756a..8db4cba529f 100644
--- a/app/assets/javascripts/ci_lint/components/ci_lint.vue
+++ b/app/assets/javascripts/ci_lint/components/ci_lint.vue
@@ -103,7 +103,7 @@ export default {
           class="gl-mr-4"
           :loading="loading"
           category="primary"
-          variant="success"
+          variant="confirm"
           data-testid="ci-lint-validate"
           @click="lint"
           >{{ __('Validate') }}</gl-button
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index d7a5e21e303..0511a179980 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -366,3 +366,8 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
   /* stylelint-disable property-no-vendor-prefix */
   -webkit-backdrop-filter: blur(2px); // still required by Safari
 }
+
+// Will be moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2708
+.gl-inset-border-l-3-red-600 {
+  box-shadow: inset $gl-border-size-3 0 0 0 $red-600;
+}
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 0d1b838906c..1609d81c0fd 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -66,6 +66,8 @@
     %p= s_('ProjectSettings|Housekeeping, export, archive, change path, transfer, and delete.')
 
   .settings-content
+    = render_if_exists 'projects/settings/restore', project: @project
+
     .sub-section
       %h4= _('Housekeeping')
       %p
diff --git a/db/post_migrate/20220310134207_add_index_project_id_and_released_at_and_id_on_releases.rb b/db/post_migrate/20220310134207_add_index_project_id_and_released_at_and_id_on_releases.rb
new file mode 100644
index 00000000000..da928f3ec8f
--- /dev/null
+++ b/db/post_migrate/20220310134207_add_index_project_id_and_released_at_and_id_on_releases.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddIndexProjectIdAndReleasedAtAndIdOnReleases < Gitlab::Database::Migration[1.0]
+  INDEX_NAME = 'index_releases_on_project_id_and_released_at_and_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :releases, [:project_id, :released_at, :id],
+      name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :releases, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20220310134207 b/db/schema_migrations/20220310134207
new file mode 100644
index 00000000000..3ba08608acc
--- /dev/null
+++ b/db/schema_migrations/20220310134207
@@ -0,0 +1 @@
+951abe39e4735f0f71ac6ad1701ffa8688dfd82a59b0383d6c55cef8f6de8e7f
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 2bda19b1cdc..fa57085e398 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -28794,6 +28794,8 @@ CREATE UNIQUE INDEX index_release_links_on_release_id_and_url ON release_links U
 
 CREATE INDEX index_releases_on_author_id_id_created_at ON releases USING btree (author_id, id, created_at);
 
+CREATE INDEX index_releases_on_project_id_and_released_at_and_id ON releases USING btree (project_id, released_at, id);
+
 CREATE INDEX index_releases_on_project_id_and_tag ON releases USING btree (project_id, tag);
 
 CREATE INDEX index_releases_on_released_at ON releases USING btree (released_at);
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index e39419fc26b..c2612b6ff16 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -440,7 +440,7 @@ stop_review:
       when: manual
 ```
 
-Both jobs must have the same [`rules`](../yaml/index.md#only--except)
+Both jobs must have the same [`rules`](../yaml/index.md#rules)
 or [`only/except`](../yaml/index.md#only--except) configuration. Otherwise,
 the `stop_review` job might not be included in all pipelines that include the
 `deploy_review` job, and you cannot trigger `action: stop` to stop the environment automatically.
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index 8a8bc1e9913..eb59c289700 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -52,6 +52,7 @@ From the Vulnerability Report you can:
 - [View an issue raised for a vulnerability](#view-issues-raised-for-a-vulnerability).
 - [Change the status of vulnerabilities](#change-status-of-vulnerabilities).
 - [Export details of vulnerabilities](#export-vulnerability-details).
+- [Manually add a vulnerability finding](#manually-add-a-vulnerability-finding).
 
 ## Vulnerability Report filters
 
@@ -219,6 +220,25 @@ You can dismiss a vulnerability for the entire project:
 
 To undo this action, select a different status from the same menu.
 
+## Manually add a vulnerability finding
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/301003) in GitLab 14.9. Disabled by default.
+
+FLAG:
+This feature is not enabled by default. To make it available, ask an administrator to 
+[enable the feature flag](../../feature_flags.md) named `new_vulnerability_form`. 
+On GitLab.com, this feature is not yet available.
+
+To add a new vulnerability finding from your project level Vulnerability Report page:
+
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Security & Compliance > Vulnerability Report**.
+1. Click on **Submit Vulnerability**.
+1. Complete the fields and submit the form.
+
+You will be brought to the newly created vulnerability's detail page. Manually created records appear in the 
+Group, Project, and Security Center Vulnerability Reports. To filter them, use the Generic Tool filter.
+
 ## Operational vulnerabilities
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/6345) in GitLab 14.6.
diff --git a/doc/user/search/img/code_search.png b/doc/user/search/img/code_search.png
deleted file mode 100644
index a6658bfcd66..00000000000
--- a/doc/user/search/img/code_search.png
+++ /dev/null
diff --git a/doc/user/search/img/code_search_git_blame_v14_9.png b/doc/user/search/img/code_search_git_blame_v14_9.png
new file mode 100644
index 00000000000..33d4e77e3f5
--- /dev/null
+++ b/doc/user/search/img/code_search_git_blame_v14_9.png
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index c3fe021aa97..c2e572a52e8 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -282,13 +282,13 @@ To search through code or other documents in a single project, you can use
 the search field on the top-right of your screen while the project page is open.
 Code search shows only the first result in the file.
 
-#### Git blame from code search **(PREMIUM)**
+#### Git blame from code search **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327052) in GitLab 14.7.
 
 You can access Git blame from any line that returned a result from the code search:
 
-![code search results](img/code_search.png)
+![code search results](img/code_search_git_blame_v14_9.png)
 
 ### SHA search
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cb0256a5441..dc24020f470 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -37519,7 +37519,7 @@ msgstr ""
 msgid "This action cannot be undone, and will permanently delete the %{key} SSH key"
 msgstr ""
 
-msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} and everything this project contains. %{strongOpen}There is no going back%{strongClose}"
+msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} and everything this project contains. %{strongOpen}There is no going back.%{strongClose}"
 msgstr ""
 
 msgid "This action deletes %{codeOpen}%{project_path_with_namespace}%{codeClose} on %{date} and everything this project contains."