Commit 41d1eca1 authored by Amy Qualls's avatar Amy Qualls Committed by Nicolò Maria Mezzopera

Update and revise docs in prep for UI work

parent 14d23005
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Manage Web IDE features') = _('Manage Web IDE features.')
.settings-content .settings-content
= form_for @application_setting, url: general_admin_application_settings_path(anchor: "#js-web-ide-settings"), html: { class: 'fieldset-form', id: 'web-ide-settings' } do |f| = form_for @application_setting, url: general_admin_application_settings_path(anchor: "#js-web-ide-settings"), html: { class: 'fieldset-form', id: 'web-ide-settings' } do |f|
= form_errors(@application_setting) = form_errors(@application_setting)
...@@ -100,7 +100,8 @@ ...@@ -100,7 +100,8 @@
= f.label :web_ide_clientside_preview_enabled, class: 'form-check-label' do = f.label :web_ide_clientside_preview_enabled, class: 'form-check-label' do
= s_('IDE|Live Preview') = s_('IDE|Live Preview')
%span.form-text.text-muted %span.form-text.text-muted
= s_('IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview.') - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/project/web_ide/index', anchor: 'enable-live-preview') }
= s_('Preview JavaScript projects in the Web IDE with CodeSandbox Live Preview. %{link_start}Learn more.%{link_end} ').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
= f.submit _('Save changes'), class: "gl-button btn btn-confirm" = f.submit _('Save changes'), class: "gl-button btn btn-confirm"
= render_if_exists 'admin/application_settings/maintenance_mode_settings_form' = render_if_exists 'admin/application_settings/maintenance_mode_settings_form'
......
...@@ -15,7 +15,7 @@ documentation for all current settings and limits on the GitLab.com instance. ...@@ -15,7 +15,7 @@ documentation for all current settings and limits on the GitLab.com instance.
## General ## General
Access the default page for admin area settings by navigating to **Admin Area > Settings > General**: Access the default page for Admin Area settings by navigating to **Admin Area > Settings > General**:
| Option | Description | | Option | Description |
| ------ | ----------- | | ------ | ----------- |
...@@ -27,7 +27,7 @@ Access the default page for admin area settings by navigating to **Admin Area > ...@@ -27,7 +27,7 @@ Access the default page for admin area settings by navigating to **Admin Area >
| [Terms of Service and Privacy Policy](terms.md) | Include a Terms of Service agreement and Privacy Policy that all users must accept. | | [Terms of Service and Privacy Policy](terms.md) | Include a Terms of Service agreement and Privacy Policy that all users must accept. |
| [External Authentication](external_authorization.md#configuration) | External Classification Policy Authorization | | [External Authentication](external_authorization.md#configuration) | External Classification Policy Authorization |
| [Web terminal](../../../administration/integration/terminal.md#limiting-websocket-connection-time) | Set max session time for web terminal. | | [Web terminal](../../../administration/integration/terminal.md#limiting-websocket-connection-time) | Set max session time for web terminal. |
| [Web IDE](../../project/web_ide/index.md#enabling-live-preview) | Manage Web IDE Features. | | [Web IDE](../../project/web_ide/index.md#enable-live-preview) | Manage Web IDE features. |
| [FLoC](floc.md) | Enable or disable [Federated Learning of Cohorts (FLoC)](https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts) tracking. | | [FLoC](floc.md) | Enable or disable [Federated Learning of Cohorts (FLoC)](https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts) tracking. |
## Integrations ## Integrations
......
...@@ -259,19 +259,27 @@ Additionally, for public projects an **Open in CodeSandbox** button is available ...@@ -259,19 +259,27 @@ Additionally, for public projects an **Open in CodeSandbox** button is available
to transfer the contents of the project into a public CodeSandbox project to to transfer the contents of the project into a public CodeSandbox project to
quickly share your project with others. quickly share your project with others.
### Enabling Live Preview ### Enable Live Preview
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/268288) in GitLab 12.9, third-party assets and libraries required for Live Preview are hosted at `https://sandbox-prod.gitlab-static.net` when it is enabled. However, some libraries are still served from other third-party services which may or may not be desirable in your environment. With Live Preview enabled, you can preview projects with a `package.json` file and
a `main` entry point inside the Web IDE.
The Live Preview feature needs to be enabled in the GitLab instance's Live Preview is enabled for all projects on GitLab.com. If you are an administrator
Admin Area. Live Preview is enabled for all projects on of a self-managed GitLab instance, and you want to enable Live Preview:
GitLab.com
![Administrator Live Preview setting](img/admin_live_preview_v13_0.png) 1. In the top navigation bar, go to **Admin Area**.
1. In the left sidebar, select **Settings > General**.
1. Scroll to **Web IDE** and select **Expand**:
![Administrator Live Preview setting](img/admin_live_preview_v13_0.png)
1. Select **Enable Live Preview** and select **Save changes**.
After you have done that, you can preview projects with a `package.json` file and [In GitLab 12.9 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/268288),
a `main` entry point inside the Web IDE. An example `package.json` is shown third-party assets and libraries required for Live Preview are hosted at
below. `https://sandbox-prod.gitlab-static.net` when it is enabled. However, some libraries
are still served from other third-party services, which may or may not be desirable
in your environment.
An example `package.json`:
```json ```json
{ {
......
...@@ -16563,9 +16563,6 @@ msgstr "" ...@@ -16563,9 +16563,6 @@ msgstr ""
msgid "IDE" msgid "IDE"
msgstr "" msgstr ""
msgid "IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview."
msgstr ""
msgid "IDE|Back" msgid "IDE|Back"
msgstr "" msgstr ""
...@@ -20070,7 +20067,7 @@ msgstr "" ...@@ -20070,7 +20067,7 @@ msgstr ""
msgid "Manage" msgid "Manage"
msgstr "" msgstr ""
msgid "Manage Web IDE features" msgid "Manage Web IDE features."
msgstr "" msgstr ""
msgid "Manage access" msgid "Manage access"
...@@ -24969,6 +24966,9 @@ msgstr "" ...@@ -24969,6 +24966,9 @@ msgstr ""
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
msgid "Preview JavaScript projects in the Web IDE with CodeSandbox Live Preview. %{link_start}Learn more.%{link_end} "
msgstr ""
msgid "Preview Markdown" msgid "Preview Markdown"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment