diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/discussions/index.md | 26 | ||||
| -rw-r--r-- | doc/user/profile/preferences.md | 5 | ||||
| -rw-r--r-- | doc/user/project/issues/design_management.md | 22 | ||||
| -rw-r--r-- | doc/user/project/static_site_editor/index.md | 7 | ||||
| -rw-r--r-- | doc/user/project/web_ide/img/dark_theme_v13.0.png | bin | 852854 -> 0 bytes | |||
| -rw-r--r-- | doc/user/project/web_ide/img/dark_theme_v13_0.png | bin | 0 -> 205992 bytes | |||
| -rw-r--r-- | doc/user/project/web_ide/img/solarized_dark_theme_v13_1.png | bin | 0 -> 117131 bytes | |||
| -rw-r--r-- | doc/user/project/web_ide/img/solarized_light_theme_v13.0.png | bin | 790377 -> 0 bytes | |||
| -rw-r--r-- | doc/user/project/web_ide/img/solarized_light_theme_v13_0.png | bin | 0 -> 194914 bytes | |||
| -rw-r--r-- | doc/user/project/web_ide/index.md | 14 |
10 files changed, 57 insertions, 17 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 5ee11c553af..44802214d7b 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -491,7 +491,10 @@ introduced by [#25381](https://gitlab.com/gitlab-org/gitlab/issues/25381). ### Batch Suggestions -> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25486) in GitLab 13.1. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25486) in GitLab 13.1 as an [alpha feature](https://about.gitlab.com/handbook/product/#alpha). +> - It's deployed behind a feature flag, disabled by default. +> - It's disabled on GitLab.com. +> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-batch-suggestions). You can apply multiple suggestions at once to reduce the number of commits added to your branch to address your reviewers' requests. @@ -512,6 +515,27 @@ to your branch to address your reviewers' requests.  +#### Enable or disable Batch Suggestions + +Batch Suggestions is +deployed behind a feature flag that is **disabled by default**. +[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) +can enable it for your instance. + +To enable it: + +```ruby +# Instance-wide +Feature.enable(:batched_suggestions) +``` + +To disable it: + +```ruby +# Instance-wide +Feature.disable(:batched_suggestions) +``` + ## Start a thread by replying to a standard comment > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30299) in GitLab 11.9 diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index ccaea61ae4b..a5fa3cf373f 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -80,8 +80,9 @@ The default syntax theme is White, and you can choose among 5 different themes: [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2389) in 13.0, the theme you choose also applies to the [Web IDE](../project/web_ide/index.md)'s code editor and [Snippets](../snippets.md). -The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808), -which applies to the entire Web IDE screen. +The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808) and +the [solarized dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/219228), +which apply to the entire Web IDE screen. ## Behavior diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index 981c2a7c34a..ac397592a3b 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -181,17 +181,23 @@ so that everyone involved can participate in the discussion. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13049) in GitLab 13.1. -Discussion threads can be resolved on Designs. You can mark a thread as resolved -or unresolved by clicking the **Resolve thread** icon at the first comment of the -discussion. +Discussion threads can be resolved on Designs. - +There are two ways to resolve/unresolve a Design thread: -Pinned comments can also be resolved or unresolved in their threads. -When replying to a comment, you will see a checkbox that you can click in order to resolve or unresolve -the thread once published. +1. You can mark a thread as resolved or unresolved by clicking the checkmark icon for **Resolve thread** in the top-right corner of the first comment of the discussion: - +  + +1. Design threads can also be resolved or unresolved in their threads by using a checkbox. + When replying to a comment, you will see a checkbox that you can click in order to resolve or unresolve + the thread once published: + +  + +Note that your resolved comment pins will disappear from the Design to free up space for new discussions. +However, if you need to revisit or find a resolved discussion, all of your resolved threads will be +available in the **Resolved Comment** area at the bottom of the right sidebar. ## Referring to designs in Markdown diff --git a/doc/user/project/static_site_editor/index.md b/doc/user/project/static_site_editor/index.md index e2e498b605a..15c3bd5522e 100644 --- a/doc/user/project/static_site_editor/index.md +++ b/doc/user/project/static_site_editor/index.md @@ -7,6 +7,8 @@ description: "The static site editor enables users to edit content on static web > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28758) in GitLab 12.10. > - WYSIWYG editor [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214559) in GitLab 13.0. +> - Support for adding images through the WYSIWYG editor [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216640) in GitLab 13.1. +> - Markdown front matter hidden on the WYSIWYG editor [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216834) in GitLab 13.1. DANGER: **Danger:** In GitLab 13.0, we [introduced breaking changes](https://gitlab.com/gitlab-org/gitlab/-/issues/213282) @@ -78,6 +80,11 @@ Anyone satisfying the [requirements](#requirements) will be able to edit the content of the pages without prior knowledge of Git nor of your site's codebase. +NOTE: **Note:** +From GitLab 13.1 onwards, the YAML front matter of Markdown files is hidden on the +WYSIWYG editor to avoid unintended changes. To edit it, use the Markdown editing mode, the regular +GitLab file editor, or the Web IDE. + ### Use the Static Site Editor to edit your content For instance, suppose you are a recently hired technical writer at a large diff --git a/doc/user/project/web_ide/img/dark_theme_v13.0.png b/doc/user/project/web_ide/img/dark_theme_v13.0.png Binary files differdeleted file mode 100644 index 6034bc52c05..00000000000 --- a/doc/user/project/web_ide/img/dark_theme_v13.0.png +++ /dev/null diff --git a/doc/user/project/web_ide/img/dark_theme_v13_0.png b/doc/user/project/web_ide/img/dark_theme_v13_0.png Binary files differnew file mode 100644 index 00000000000..f1999363904 --- /dev/null +++ b/doc/user/project/web_ide/img/dark_theme_v13_0.png diff --git a/doc/user/project/web_ide/img/solarized_dark_theme_v13_1.png b/doc/user/project/web_ide/img/solarized_dark_theme_v13_1.png Binary files differnew file mode 100644 index 00000000000..ccb9cf6f126 --- /dev/null +++ b/doc/user/project/web_ide/img/solarized_dark_theme_v13_1.png diff --git a/doc/user/project/web_ide/img/solarized_light_theme_v13.0.png b/doc/user/project/web_ide/img/solarized_light_theme_v13.0.png Binary files differdeleted file mode 100644 index f3c4aa142a4..00000000000 --- a/doc/user/project/web_ide/img/solarized_light_theme_v13.0.png +++ /dev/null diff --git a/doc/user/project/web_ide/img/solarized_light_theme_v13_0.png b/doc/user/project/web_ide/img/solarized_light_theme_v13_0.png Binary files differnew file mode 100644 index 00000000000..adf6d3c6b02 --- /dev/null +++ b/doc/user/project/web_ide/img/solarized_light_theme_v13_0.png diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 0ddc9762bc5..ce20f2308e6 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -45,17 +45,19 @@ Single file editing is based on the [Ace Editor](https://ace.c9.io). ### Themes -> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2389) in GitLab 13.0. +> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2389) in GitLab in 13.0. +> - Full Solarized Dark Theme [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/219228) in GitLab 13.1. All the themes GitLab supports for syntax highlighting are added to the Web IDE's code editor. You can pick a theme from your [profile preferences](../../profile/preferences.md). -The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808), -which applies to the entire Web IDE screen. +The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808) and +the [solarized dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/219228), +which apply to the entire Web IDE screen. -| Solarized Light Theme | Dark Theme | -|---------------------------------------------------------------|-----------------------------------------| -|  |  | +| Solarized Light Theme | Solarized Dark Theme | Dark Theme | +|---------------------------------------------------------------|-------------------------------------------------------------|-----------------------------------------| +|  |  |  | ## Configure the Web IDE |
