Add latest changes from gitlab-org/gitlab@master

8 files changed, 128 insertions, 24 deletions

diff --git a/doc/administration/geo/secondary_proxy/index.md b/doc/administration/geo/secondary_proxy/index.md
index 42834a9dc95..ac8b88a91d5 100644
--- a/doc/administration/geo/secondary_proxy/index.md
+++ b/doc/administration/geo/secondary_proxy/index.md
@@ -83,11 +83,18 @@ You can also add feedback in the epic about any use-cases that
 are not possible anymore with proxying enabled.
 
 If you run into issues, to disable this feature, disable the `geo_secondary_proxy_separate_urls` feature flag.
-SSH into one node running Rails on your primary Geo site and run:
 
-```shell
-sudo gitlab-rails runner "Feature.disable(:geo_secondary_proxy_separate_urls)"
-```
+1. SSH into one node running Rails on your primary Geo site and run:
+
+   ```shell
+   sudo gitlab-rails runner "Feature.disable(:geo_secondary_proxy_separate_urls)"
+   ```
+
+1. Restart Puma on all of the nodes running Rails on your secondary Geo site:
+
+   ```shell
+   sudo gitlab-ctl restart puma
+   ```
 
 In Kubernetes, you can run the same command in the toolbox pod. Refer to the
 [Kubernetes cheat sheet](https://docs.gitlab.com/charts/troubleshooting/kubernetes_cheat_sheet.html#gitlab-specific-kubernetes-information)
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index de52a07b2f8..072279d2dd7 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -395,12 +395,12 @@ Use [`workflow`](workflow.md) to control pipeline behavior.
 
 #### `workflow:name`
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/372538) in GitLab 15.5 [with a flag](../../administration/feature_flags.md) named `pipeline_name`. Disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/372538) in GitLab 15.5 [with a flag](../../administration/feature_flags.md) named `pipeline_name`. Disabled by default.
+> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/376095) in GitLab 15.7.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
-ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `pipeline_name`.
-The feature is not ready for production use.
+On self-managed GitLab, by default this feature is available. To hide the feature,
+ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `pipeline_name`.
 
 You can use `name` in `workflow:` to define a name for pipelines.
 
diff --git a/doc/user/admin_area/settings/sign_in_restrictions.md b/doc/user/admin_area/settings/sign_in_restrictions.md
index 36188da356e..6ec3d082114 100644
--- a/doc/user/admin_area/settings/sign_in_restrictions.md
+++ b/doc/user/admin_area/settings/sign_in_restrictions.md
@@ -68,7 +68,7 @@ For more information, see the [list of settings that can be accessed through API
 Open the [Rails console](../../../administration/operations/rails_console.md) and run the following:
 
 ```ruby
-::Gitlab::CurrentSettings.update_attributes!(admin_mode: true)
+::Gitlab::CurrentSettings.update!(admin_mode true)
 ```
 
 #### Use the UI to enable Admin Mode
diff --git a/doc/user/profile/contributions_calendar.md b/doc/user/profile/contributions_calendar.md
index e8901ba907d..eedb34bba16 100644
--- a/doc/user/profile/contributions_calendar.md
+++ b/doc/user/profile/contributions_calendar.md
@@ -24,9 +24,9 @@ GitLab tracks the following contribution events:
 | Event | Contribution |
 | ----- | ------------ |
 | `approved` | Merge request |
-| `closed` | [Epic](../group/epics/index.md), Issue, Merge request, Milestone |
+| `closed` | [Epic](../group/epics/index.md), Issue, WorkItem, Merge request, Milestone |
 | `commented` on any `Noteable` record. | Alert, Commit, Design, Issue, Merge request, Snippet |
-| `created` | Design, Epic, Issue, Merge request, Milestone, Project, Wiki page |
+| `created` | Design, Epic, Issue, WorkItem, Merge request, Milestone, Project, Wiki page |
 | `destroyed` | Design, Milestone, Wiki page |
 | `expired` | Project membership |
 | `joined` | Project membership |
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 018a441af6b..664d22959a2 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -208,16 +208,15 @@ Open an issue if you notice that using absolute times breaks a layout.
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/370139) in GitLab 15.7 [with a flag](../../administration/feature_flags.md) named `vscode_web_ide`. Disabled by default.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `vscode_web_ide`. On GitLab.com, this feature is not available. The feature is not ready for production use.
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `vscode_web_ide`. On GitLab.com, this feature is available.
 
-The [Web IDE Beta](../project/web_ide/index.md#vs-code-reimplementation) is
+The [Web IDE Beta](../project/web_ide_beta/index.md) is
 the default editing environment when the `vscode_web_ide` feature
 flag is enabled.
 
 To stop using the Web IDE Beta:
 
-1. On the **Preferences** page, go to **Web IDE**.
-1. Select the **Opt out of the Web IDE Beta** checkbox.
+1. In the **Web IDE** section, select the **Opt out of the Web IDE Beta** checkbox.
 1. Select **Save changes**.
 
 ## Integrations
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
index ee6af3b0aa6..fb100986df9 100644
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
@@ -10,6 +10,10 @@ The Web Integrated Development Environment (IDE) editor streamlines the process
 to contribute changes to your projects, by providing an advanced editor with
 commit staging.
 
+NOTE:
+The Web IDE is being updated to use VS Code. For details,
+see [Web IDE Beta](../web_ide_beta/index.md).
+
 ## Open the Web IDE
 
 Use the <kbd>.</kbd> [keyboard shortcut](../../shortcuts.md) to open the Web IDE.
@@ -459,12 +463,3 @@ The Web IDE has a few limitations:
 - If the terminal displays **Connection Failure**, then the terminal could not
   connect to the runner. Try to stop and restart the terminal. If the
   problem persists, double check your runner configuration.
-
-## VS Code Reimplementation
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95169) in GitLab 15.4 [with a flag](../../../administration/feature_flags.md) named `vscode_web_ide`. Disabled by default.
-
-As announced in [this blog post](https://about.gitlab.com/blog/2022/05/23/the-future-of-the-gitlab-web-ide/),
-the current implementation of the Web IDE will be replaced with a [VS Code inspired implementation](https://gitlab.com/groups/gitlab-org/-/epics/7683).
-
-This effort is currently under development. Follow [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7683) for updates and more information.
diff --git a/doc/user/project/web_ide_beta/img/fuzzy_finder_v15_7.png b/doc/user/project/web_ide_beta/img/fuzzy_finder_v15_7.png
new file mode 100644
index 00000000000..66ebae15e98
--- /dev/null
+++ b/doc/user/project/web_ide_beta/img/fuzzy_finder_v15_7.png
diff --git a/doc/user/project/web_ide_beta/index.md b/doc/user/project/web_ide_beta/index.md
new file mode 100644
index 00000000000..ef07cca465d
--- /dev/null
+++ b/doc/user/project/web_ide_beta/index.md
@@ -0,0 +1,103 @@
+---
+stage: Create
+group: Editor
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Web IDE Beta **(FREE)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95169) in GitLab 15.4 [with a flag](../../../administration/feature_flags.md) named `vscode_web_ide`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `vscode_web_ide`. On GitLab.com, this feature is available.
+
+As announced in [this blog post](https://about.gitlab.com/blog/2022/05/23/the-future-of-the-gitlab-web-ide/),
+the current implementation of the Web IDE is being replaced with an
+implementation inspired by Visual Studio Code.
+
+This effort is currently under development. For updates,
+see [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7683).
+
+## Enable the Web IDE Beta
+
+To use the Web IDE Beta on a self-managed GitLab instance,
+ensure that the `vscode_web_ide` feature flag
+[is enabled](../../../administration/feature_flags.md).
+
+On GitLab.com, this feature is available by default. However, you can
+[stop using it if you choose](#stop-using-the-web-ide-beta).
+
+## Use the Web IDE Beta
+
+To open the Web IDE Beta from anywhere in the UI:
+
+- Use the <kbd>.</kbd> [keyboard shortcut](../../shortcuts.md).
+
+You can also open the Web IDE Beta when viewing a file, the repository file list,
+and from merge requests.
+
+### Use when viewing a file or the repository file list
+
+To open the Web IDE Beta from a file or the repository file list:
+
+- On the top right of the page, select **Open in Web IDE**.
+
+If **Open in Web IDE** is not visible:
+
+1. Next to **Edit** or **Gitpod**, select the down arrow (**{chevron-lg-down}**).
+1. From the list, select **Open in Web IDE**.
+1. Select **Open in Web IDE**.
+
+### Use when viewing a merge request
+
+To open the Web IDE Beta from a merge request:
+
+1. Go to your merge request.
+1. In the upper right corner, select **Code > Open in Web IDE**.
+
+## Open a file in the Web IDE Beta
+
+To open any file by its name:
+
+1. Type **Command** + **`P`** (<kbd>⌘</kbd> + <kbd>P</kbd>).
+1. Type the name of your file.
+
+![fuzzy_finder_v15_7](img/fuzzy_finder_v15_7.png)
+
+## Search across files
+
+You can use VS Code to quickly search all files in the currently opened folder.
+
+To enter your search term:
+
+1. Type **Shift** + **Command** + **`F`** (<kbd>⇧</kbd> + <kbd>⌘</kbd> + <kbd>F</kbd>).
+1. Enter your search term.
+
+In the Web IDE Beta, only partial results from opened files are displayed.
+Full file search is planned for a later date.
+
+## View list of changed files
+
+To view the list of files you changed in the Web IDE Beta:
+
+- On the VS Code Activity Bar, on the left, select the Source Control icon:
+
+Your `CHANGES`, `STAGED CHANGES` and `MERGE CHANGES` are displayed.
+
+For details, see [the VS Code documentation](https://code.visualstudio.com/docs/sourcecontrol/overview#_commit).
+
+## Known issues
+
+The [Web Terminal](../web_ide/index.md#interactive-web-terminals-for-the-web-ide)
+and [Live Preview](../web_ide/index.md#live-preview) are not available in the Web IDE Beta.
+
+These features may become available at a later date.
+
+### Stop using the Web IDE Beta
+
+If you do not want to use the Web IDE Beta, you can change your personal preferences.
+
+1. On the top bar, in the top right corner, select your avatar.
+1. Select **Preferences**.
+1. In the **Web IDE** section, select the **Opt out of the Web IDE Beta** checkbox.
+1. Select **Save changes**.