Commit 55fe7626 authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis

Allow sass and self badges in ui doc links

Docs links have new badges, so we have to allow
for them
parent a6080c29
---
title: Allow new docs badges in UI links
merge_request: 52651
author:
type: other
...@@ -5,9 +5,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -5,9 +5,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, api type: reference, api
--- ---
# Visual Review discussions API **(STARTER)** # Visual Review discussions API **(PREMIUM)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18710) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.5. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18710) in GitLab 12.5.
> - [Moved](https://about.gitlab.com/blog/2021/01/26/new-gitlab-product-subscription-model/) to GitLab Premium in 13.9.
Visual Review discussions are notes on Merge Requests sent as Visual Review discussions are notes on Merge Requests sent as
feedback from [Visual Reviews](../ci/review_apps/index.md#visual-reviews). feedback from [Visual Reviews](../ci/review_apps/index.md#visual-reviews).
......
...@@ -166,9 +166,10 @@ Read the [documentation on Pipelines for Merged Results](pipelines_for_merged_re ...@@ -166,9 +166,10 @@ Read the [documentation on Pipelines for Merged Results](pipelines_for_merged_re
Read the [documentation on Merge Trains](pipelines_for_merged_results/merge_trains/index.md). Read the [documentation on Merge Trains](pipelines_for_merged_results/merge_trains/index.md).
## Run pipelines in the parent project for merge requests from a forked project **(STARTER)** ## Run pipelines in the parent project for merge requests from a forked project **(PREMIUM)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217451) in GitLab 13.3. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217451) in GitLab 13.3.
> - [Moved](https://about.gitlab.com/blog/2021/01/26/new-gitlab-product-subscription-model/) to GitLab Premium in 13.9.
By default, external contributors working from forks can't create pipelines in the By default, external contributors working from forks can't create pipelines in the
parent project. When a pipeline for merge requests is triggered by a merge request parent project. When a pipeline for merge requests is triggered by a merge request
......
...@@ -186,12 +186,13 @@ After you have the route mapping set up, it takes effect in the following locati ...@@ -186,12 +186,13 @@ After you have the route mapping set up, it takes effect in the following locati
![View on environment button in file view](img/view_on_env_blob.png) ![View on environment button in file view](img/view_on_env_blob.png)
## Visual Reviews **(STARTER)** ## Visual Reviews **(PREMIUM)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10761) in GitLab Starter 12.0. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10761) in GitLab 12.0.
> - [Moved](https://about.gitlab.com/blog/2021/01/26/new-gitlab-product-subscription-model/) to GitLab Premium in 13.9.
> - It's [deployed behind a feature flag](../../user/feature_flags.md), enabled by default. > - It's [deployed behind a feature flag](../../user/feature_flags.md), enabled by default.
> - It's enabled on GitLab.com. > - It's enabled on GitLab.com.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-visual-reviews). **(STARTER ONLY)** > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-visual-reviews). **(PREMIUM SELF)**
With Visual Reviews, members of any team (Product, Design, Quality, and so on) can provide feedback comments through a form in your review apps. The comments are added to the merge request that triggered the review app. With Visual Reviews, members of any team (Product, Design, Quality, and so on) can provide feedback comments through a form in your review apps. The comments are added to the merge request that triggered the review app.
...@@ -288,7 +289,7 @@ can supply the ID by either:​​ ...@@ -288,7 +289,7 @@ can supply the ID by either:​​
- Dynamically adding the `data-merge-request-id` value during the build of the app. - Dynamically adding the `data-merge-request-id` value during the build of the app.
- Supplying it manually through the visual review form in the app. - Supplying it manually through the visual review form in the app.
### Enable or disable Visual Reviews **(STARTER ONLY)** ### Enable or disable Visual Reviews **(PREMIUM SELF)**
Visual Reviews is deployed behind a feature flag that is **enabled by default**. Visual Reviews is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
......
...@@ -86,9 +86,9 @@ be updated for artifacts created before this setting was changed. ...@@ -86,9 +86,9 @@ be updated for artifacts created before this setting was changed.
The administrator may need to manually search for and expire previously-created The administrator may need to manually search for and expire previously-created
artifacts, as described in the [troubleshooting documentation](../../../administration/troubleshooting/gitlab_rails_cheat_sheet.md#remove-artifacts-more-than-a-week-old). artifacts, as described in the [troubleshooting documentation](../../../administration/troubleshooting/gitlab_rails_cheat_sheet.md#remove-artifacts-more-than-a-week-old).
## Shared runners pipeline minutes quota **(STARTER ONLY)** ## Shared runners pipeline minutes quota **(PREMIUM SELF)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1078) in GitLab Starter 8.16. > [Moved](https://about.gitlab.com/blog/2021/01/26/new-gitlab-product-subscription-model/) to GitLab Premium in 13.9.
If you have enabled shared runners for your GitLab instance, you can limit their If you have enabled shared runners for your GitLab instance, you can limit their
usage by setting a maximum number of pipeline minutes that a group can use on usage by setting a maximum number of pipeline minutes that a group can use on
...@@ -158,18 +158,6 @@ Area of your GitLab instance (`.gitlab-ci.yml` if not set): ...@@ -158,18 +158,6 @@ Area of your GitLab instance (`.gitlab-ci.yml` if not set):
It is also possible to specify a [custom CI configuration path for a specific project](../../../ci/pipelines/settings.md#custom-ci-configuration-path). It is also possible to specify a [custom CI configuration path for a specific project](../../../ci/pipelines/settings.md#custom-ci-configuration-path).
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->
## Required pipeline configuration **(PREMIUM ONLY)** ## Required pipeline configuration **(PREMIUM ONLY)**
WARNING: WARNING:
...@@ -228,3 +216,15 @@ To set the maximum file size: ...@@ -228,3 +216,15 @@ To set the maximum file size:
1. Find the package type you would like to adjust. 1. Find the package type you would like to adjust.
1. Enter the maximum file size, in bytes. 1. Enter the maximum file size, in bytes.
1. Click **Save size limits**. 1. Click **Save size limits**.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->
...@@ -4,7 +4,7 @@ module Gitlab ...@@ -4,7 +4,7 @@ module Gitlab
module Utils module Utils
module Markdown module Markdown
PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u.freeze PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u.freeze
PRODUCT_SUFFIX = /\s*\**\((core|starter|premium|ultimate)(\s+only)?\)\**/.freeze PRODUCT_SUFFIX = /\s*\**\((core|starter|premium|ultimate)(\s+(only|self|sass))?\)\**/.freeze
def string_to_anchor(string) def string_to_anchor(string)
string string
......
...@@ -59,8 +59,8 @@ RSpec.describe Gitlab::Utils::Markdown do ...@@ -59,8 +59,8 @@ RSpec.describe Gitlab::Utils::Markdown do
is_expected.to eq 'my-header' is_expected.to eq 'my-header'
end end
context 'with only modifier' do context 'with self modifier' do
let(:string) { 'My Header (STARTER ONLY)' } let(:string) { 'My Header (PREMIUM SELF)' }
it 'ignores a product suffix' do it 'ignores a product suffix' do
is_expected.to eq 'my-header' is_expected.to eq 'my-header'
...@@ -68,15 +68,15 @@ RSpec.describe Gitlab::Utils::Markdown do ...@@ -68,15 +68,15 @@ RSpec.describe Gitlab::Utils::Markdown do
end end
context 'with "*" around a product suffix' do context 'with "*" around a product suffix' do
let(:string) { 'My Header **(STARTER)**' } let(:string) { 'My Header **(PREMIUM)**' }
it 'ignores a product suffix' do it 'ignores a product suffix' do
is_expected.to eq 'my-header' is_expected.to eq 'my-header'
end end
end end
context 'with "*" around a product suffix and only modifier' do context 'with "*" around a product suffix and sass modifier' do
let(:string) { 'My Header **(STARTER ONLY)**' } let(:string) { 'My Header **(PREMIUM SASS)**' }
it 'ignores a product suffix' do it 'ignores a product suffix' do
is_expected.to eq 'my-header' is_expected.to eq 'my-header'
......
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