Add latest changes from gitlab-org/gitlab@master

12 files changed, 21 insertions, 16 deletions

diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml
index fab3ce584f0..96fb848b568 100644
--- a/app/views/admin/application_settings/_abuse.html.haml
+++ b/app/views/admin/application_settings/_abuse.html.haml
@@ -5,7 +5,5 @@
     .form-group
       = f.label :abuse_notification_email, _('Abuse reports notification email'), class: 'label-bold'
       = f.text_field :abuse_notification_email, class: 'form-control gl-form-input'
-      .form-text.text-muted
-        = _('Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.')
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"
diff --git a/app/views/admin/application_settings/reporting.html.haml b/app/views/admin/application_settings/reporting.html.haml
index f05231a3cd2..d2e118f0624 100644
--- a/app/views/admin/application_settings/reporting.html.haml
+++ b/app/views/admin/application_settings/reporting.html.haml
@@ -20,6 +20,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Set notification email for abuse reports.')
+      = _('Receive notification of abuse reports by email.')
+      = link_to _('Learn more.'), help_page_path('user/admin_area/review_abuse_reports.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'abuse'
diff --git a/db/migrate/20210930081208_fix_deprecated_api_throttle_defaults.rb b/db/migrate/20210930081208_fix_deprecated_api_throttle_defaults.rb
new file mode 100644
index 00000000000..be82b16ee8c
--- /dev/null
+++ b/db/migrate/20210930081208_fix_deprecated_api_throttle_defaults.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class FixDeprecatedApiThrottleDefaults < Gitlab::Database::Migration[1.0]
+  def change
+    change_column_default :application_settings, :throttle_unauthenticated_deprecated_api_requests_per_period, from: 3600, to: 1800
+    change_column_default :application_settings, :throttle_authenticated_deprecated_api_period_in_seconds, from: 1800, to: 3600
+  end
+end
diff --git a/db/schema_migrations/20210930081208 b/db/schema_migrations/20210930081208
new file mode 100644
index 00000000000..a0c1d701717
--- /dev/null
+++ b/db/schema_migrations/20210930081208
@@ -0,0 +1 @@
+4b2c1b8e80f481d2dbbcfcb61c0a3d3081cbe4081fdd710040a028d72bd5d0e4
\ No newline at end of file
diff --git a/doc/administration/package_information/defaults.md b/doc/administration/package_information/defaults.md
index 92923141c9b..0c104677206 100644
--- a/doc/administration/package_information/defaults.md
+++ b/doc/administration/package_information/defaults.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# Package defaults
+# Package defaults **(FREE SELF)**
 
 Unless configuration is specified in the `/etc/gitlab/gitlab.rb` file,
 the package will assume the defaults as noted below.
diff --git a/doc/administration/package_information/deprecated_os.md b/doc/administration/package_information/deprecated_os.md
index 251dbe1e20e..35b333241b2 100644
--- a/doc/administration/package_information/deprecated_os.md
+++ b/doc/administration/package_information/deprecated_os.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# OS Versions that are no longer supported
+# OS Versions that are no longer supported **(FREE SELF)**
 
 GitLab provides omnibus packages for operating systems only until their
 EOL (End-Of-Life). After the EOL date of the OS, GitLab will stop releasing
diff --git a/doc/administration/package_information/deprecation_policy.md b/doc/administration/package_information/deprecation_policy.md
index dd2f8734e1c..80ce72d54f5 100644
--- a/doc/administration/package_information/deprecation_policy.md
+++ b/doc/administration/package_information/deprecation_policy.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# Deprecation policy
+# Deprecation policy **(FREE SELF)**
 
 The Omnibus GitLab packages come with number of different libraries and services which offers users plethora of configuration options.
 
diff --git a/doc/administration/package_information/licensing.md b/doc/administration/package_information/licensing.md
index 8557a94bf93..02358c66993 100644
--- a/doc/administration/package_information/licensing.md
+++ b/doc/administration/package_information/licensing.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# Package Licensing
+# Package Licensing **(FREE SELF)**
 
 ## License
 
diff --git a/doc/administration/package_information/omnibus_packages.md b/doc/administration/package_information/omnibus_packages.md
index aa73534fc55..115d6c394ad 100644
--- a/doc/administration/package_information/omnibus_packages.md
+++ b/doc/administration/package_information/omnibus_packages.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# Omnibus based packages and images
+# Omnibus based packages and images **(FREE SELF)**
 
 Below you can find some basic information on why GitLab provides packages and
 a Docker image that come with bundled dependencies.
diff --git a/doc/administration/package_information/postgresql_versions.md b/doc/administration/package_information/postgresql_versions.md
index 89da4864872..252e0cad76d 100644
--- a/doc/administration/package_information/postgresql_versions.md
+++ b/doc/administration/package_information/postgresql_versions.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# PostgreSQL versions shipped with Omnibus GitLab
+# PostgreSQL versions shipped with Omnibus GitLab **(FREE SELF)**
 
 NOTE:
 This table lists only GitLab versions where a significant change happened in the
diff --git a/doc/administration/package_information/signed_packages.md b/doc/administration/package_information/signed_packages.md
index 420623d9e1e..fb605f8d5be 100644
--- a/doc/administration/package_information/signed_packages.md
+++ b/doc/administration/package_information/signed_packages.md
@@ -4,7 +4,7 @@ group: Distribution
 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/#designated-technical-writers
 ---
 
-# Package Signatures
+# Package Signatures **(FREE SELF)**
 
 As of the release of GitLab 9.5 on August 22, 2017, GitLab provides signed Omnibus GitLab packages for RPM and DEB based distributions. This means that all packages provided on <https://packages.gitlab.com> are signed, starting with `9.5.0`, and all future versions of supported branches (for example `9.3.x` and `9.4.x` after August 22, 2017). Any package version prior to August 22, 2017, will not be signed. Please pass the appropriate argument to your package manager. (Example: `yum --nogpgcheck`)
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ce2a62d0cf9..af7be268904 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1691,9 +1691,6 @@ msgstr ""
 msgid "Abuse reports notification email"
 msgstr ""
 
-msgid "Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area."
-msgstr ""
-
 msgid "Accept invitation"
 msgstr ""
 
@@ -27925,6 +27922,9 @@ msgstr ""
 msgid "Receive any notifications from GitLab."
 msgstr ""
 
+msgid "Receive notification of abuse reports by email."
+msgstr ""
+
 msgid "Receive notifications about your own activity"
 msgstr ""
 
@@ -30988,9 +30988,6 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-msgid "Set notification email for abuse reports."
-msgstr ""
-
 msgid "Set parent epic to an epic"
 msgstr ""