Add latest changes from gitlab-org/gitlab@master

5 files changed, 51 insertions, 6 deletions

diff --git a/app/assets/stylesheets/page_bundles/escalation_policies.scss b/app/assets/stylesheets/page_bundles/escalation_policies.scss
new file mode 100644
index 00000000000..e040e9ab1a0
--- /dev/null
+++ b/app/assets/stylesheets/page_bundles/escalation_policies.scss
@@ -0,0 +1,14 @@
+.escalation-policy-modal {
+  width: 640px;
+}
+
+.escalation-policy-rules {
+  .rule-control {
+    width: 240px;
+  }
+
+  .rule-elapsed-minutes {
+    width: 56px;
+  }
+}
+
diff --git a/config/application.rb b/config/application.rb
index f5ed25b1f86..010ef9fff1b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -214,6 +214,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/milestone.css"
     config.assets.precompile << "page_bundles/new_namespace.css"
     config.assets.precompile << "page_bundles/oncall_schedules.css"
+    config.assets.precompile << "page_bundles/escalation_policies.css"
     config.assets.precompile << "page_bundles/pipeline.css"
     config.assets.precompile << "page_bundles/pipeline_schedules.css"
     config.assets.precompile << "page_bundles/pipelines.css"
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md
index 25640671e78..4181e32fcf2 100644
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
@@ -4,7 +4,7 @@ group: Access
 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
 ---
 
-# Authentication
+# Authentication **(FREE)**
 
 This page gathers all the resources for the topic **Authentication** within GitLab.
 
@@ -33,15 +33,15 @@ This page gathers all the resources for the topic **Authentication** within GitL
   - [Atlassian Crowd OmniAuth Provider](../../administration/auth/crowd.md)
   - [CAS OmniAuth Provider](../../integration/cas.md)
   - [SAML OmniAuth Provider](../../integration/saml.md)
-  - [SAML for GitLab.com Groups](../../user/group/saml_sso/index.md) **(PREMIUM SAAS)**
-  - [SCIM user provisioning for GitLab.com Groups](../../user/group/saml_sso/scim_setup.md) **(PREMIUM SAAS)**
-  - [Kerberos integration (GitLab EE)](../../integration/kerberos.md) **(STARTER)**
+  - [SAML for GitLab.com Groups](../../user/group/saml_sso/index.md)
+  - [SCIM user provisioning for GitLab.com Groups](../../user/group/saml_sso/scim_setup.md)
+  - [Kerberos integration (GitLab EE)](../../integration/kerberos.md)
 
 ## API
 
 - [OAuth 2 Tokens](../../api/README.md#oauth2-tokens)
 - [Personal access tokens](../../api/README.md#personalproject-access-tokens)
-- [Project access tokens](../../api/README.md#personalproject-access-tokens) **(FREE SELF)**
+- [Project access tokens](../../api/README.md#personalproject-access-tokens)
 - [Impersonation tokens](../../api/README.md#impersonation-tokens)
 - [GitLab as an OAuth2 provider](../../api/oauth2.md#gitlab-as-an-oauth2-provider)
 
@@ -53,4 +53,4 @@ This page gathers all the resources for the topic **Authentication** within GitL
 - [Jenkins GitLab OAuth Plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+OAuth+Plugin)
 - [OKD - Configuring Authentication and User Agent](https://docs.okd.io/3.11/install_config/configuring_authentication.html#GitLab)
 
-<!-- vale gitlab.Spelling = YES -->
\ No newline at end of file
+<!-- vale gitlab.Spelling = YES -->
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index def0fa7f3ba..65a0ace25fa 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -139,6 +139,12 @@ If you want to change to another branch, you can use [`git stash`](https://www.g
 1. Commit, push, and test.
 1. Return to the branch where you want to resume your changes.
 1. Use `git stash list` to list all previously stashed commits.
+
+   ```shell
+   stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
+   stash@{1}: On master: 9cc0589... Add git-stash
+   ```
+
 1. Run a version of `git stash`:
 
    - Use `git stash pop` to redo previously stashed changes and remove them from stashed list.
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index edfcd9aa7e1..2e435535c1a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -13093,15 +13093,39 @@ msgstr ""
 msgid "Escalation policies"
 msgstr ""
 
+msgid "EscalationPolicies|+ Add an additional rule"
+msgstr ""
+
 msgid "EscalationPolicies|Add an escalation policy"
 msgstr ""
 
+msgid "EscalationPolicies|Add escalation policy"
+msgstr ""
+
 msgid "EscalationPolicies|Create an escalation policy in GitLab"
 msgstr ""
 
+msgid "EscalationPolicies|Edit escalation policy"
+msgstr ""
+
+msgid "EscalationPolicies|Email on-call user in schedule"
+msgstr ""
+
+msgid "EscalationPolicies|Escalation rules"
+msgstr ""
+
+msgid "EscalationPolicies|IF alert is not %{alertStatus} in %{minutes} minutes"
+msgstr ""
+
+msgid "EscalationPolicies|Select schedule"
+msgstr ""
+
 msgid "EscalationPolicies|Set up escalation policies to define who is paged, and when, in the event the first users paged don't respond."
 msgstr ""
 
+msgid "EscalationPolicies|THEN %{doAction} %{schedule}"
+msgstr ""
+
 msgid "Estimate"
 msgstr ""