diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-19 03:11:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-19 03:11:08 +0000 |
| commit | bd1944e6cc35261fac30affee839dfc6de0e1667 (patch) | |
| tree | c57598701bed6d11966f4024f3d80261e40914d8 | |
| parent | 0cf9e09f8e55875c6c229055c8777ed52b36b5bc (diff) | |
| download | gitlab-ce-bd1944e6cc35261fac30affee839dfc6de0e1667.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/modal_copy_button.vue | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/cc-verbiage-sast-in-core.yml | 5 | ||||
| -rw-r--r-- | doc/ci/pipelines/job_artifacts.md | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/modal_copy_button.vue b/app/assets/javascripts/vue_shared/components/modal_copy_button.vue index 6b251c6c125..e3a7f144321 100644 --- a/app/assets/javascripts/vue_shared/components/modal_copy_button.vue +++ b/app/assets/javascripts/vue_shared/components/modal_copy_button.vue @@ -55,6 +55,11 @@ export default { required: false, default: null, }, + category: { + type: String, + required: false, + default: 'primary', + }, }, computed: { modalDomId() { @@ -95,6 +100,7 @@ export default { :data-clipboard-target="target" :data-clipboard-text="text" :title="title" + :category="category" icon="copy-to-clipboard" /> </template> diff --git a/changelogs/unreleased/cc-verbiage-sast-in-core.yml b/changelogs/unreleased/cc-verbiage-sast-in-core.yml new file mode 100644 index 00000000000..5d286ce77e7 --- /dev/null +++ b/changelogs/unreleased/cc-verbiage-sast-in-core.yml @@ -0,0 +1,5 @@ +--- +title: Add verbiage + link sast to show it's in core. +merge_request: 51935 +author: +type: Other diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md index 97745f1d01f..4c77a578aa4 100644 --- a/doc/ci/pipelines/job_artifacts.md +++ b/doc/ci/pipelines/job_artifacts.md @@ -155,9 +155,10 @@ as artifacts. The collected Code Quality report uploads to GitLab as an artifact and is summarized in merge requests. -#### `artifacts:reports:sast` **(ULTIMATE)** +#### `artifacts:reports:sast` > - Introduced in GitLab 11.5. +> - Made [available in all tiers](https://gitlab.com/groups/gitlab-org/-/epics/2098) in GitLab 13.3. > - Requires GitLab Runner 11.5 and above. The `sast` report collects [SAST vulnerabilities](../../user/application_security/sast/index.md) |