diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 06:09:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 06:09:44 +0000 |
| commit | cf58004721ee715dd3884476f6fa0c62a7e7f247 (patch) | |
| tree | cb5ba37b4037e8150f6ea042a1dd16f43a741dbb | |
| parent | 7c4ef7b9fd144c51102f9b7530053a5a7efc5ef8 (diff) | |
| download | gitlab-ce-cf58004721ee715dd3884476f6fa0c62a7e7f247.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/user/project/merge_requests/code_quality.md | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md index 0525d17cca2..76c5192a482 100644 --- a/doc/user/project/merge_requests/code_quality.md +++ b/doc/user/project/merge_requests/code_quality.md @@ -228,7 +228,7 @@ do this: artifact](../../../ci/yaml/README.md#artifactsreportscodequality-starter). 1. Configure your tool to generate the Code Quality report artifact as a JSON file that implements subset of the [Code Climate - spec](https://github.com/codeclimate/spec/blob/master/SPEC.md#data-types). + spec](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types). The Code Quality report artifact JSON file must contain an array of objects with the following properties: diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 97cbe7faeb4..8bf7eb8bc63 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12960,6 +12960,9 @@ msgstr "" msgid "Name has already been taken" msgstr "" +msgid "Name must be between 1 and 255 characters" +msgstr "" + msgid "Name new label" msgstr "" @@ -20099,6 +20102,9 @@ msgstr "" msgid "There was an error resetting user pipeline minutes." msgstr "" +msgid "There was an error saving this Geo Node" +msgstr "" + msgid "There was an error saving your changes." msgstr "" @@ -21264,6 +21270,9 @@ msgstr "" msgid "URL" msgstr "" +msgid "URL must be a valid url (ex: https://gitlab.com)" +msgstr "" + msgid "URL of the external storage that will serve the repository static objects (e.g. archives, blobs, ...)." msgstr "" |