diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-06-19 06:46:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-06-19 06:46:22 +0000 |
| commit | 61c50f0c92eda389794c3e5e9ac97c2973362850 (patch) | |
| tree | 2742a7bd20f482a11294ab509deaa5798ec1d732 | |
| parent | ff2af12614506778d970ed907f9c2b2b471e90e4 (diff) | |
| parent | 69e1bd389f3cb04d451900f981be646462ffd039 (diff) | |
| download | gitlab-ce-61c50f0c92eda389794c3e5e9ac97c2973362850.tar.gz | |
Automatic merge of gitlab-org/gitlab-ce master
| -rw-r--r-- | changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml | 5 | ||||
| -rw-r--r-- | doc/development/i18n/externalization.md | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml b/changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml new file mode 100644 index 00000000000..191e64df4f1 --- /dev/null +++ b/changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml @@ -0,0 +1,5 @@ +--- +title: Fix Container Scanning job timeout when using the kubernetes executor +merge_request: 29706 +author: +type: fixed diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 9fb8ea542d9..ce310672dad 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -77,6 +77,9 @@ Or: hello = _("Hello world!") ``` +NOTE: **Note:** Messages in the API (`lib/api/` or `app/graphql`) do +not need to be externalised. + ### HAML files Given the following content in HAML: diff --git a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml index 4b931d9bfa9..d04b054fa7b 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -30,7 +30,7 @@ container_scanning: services: - docker:stable-dind script: - - if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then { export DOCKER_SERVICE="localhost" ; export DOCKER_HOST="tcp://${DOCKER_SERVICE}:2375" ; } fi + - if [[ -n "$KUBERNETES_PORT" ]]; then { export DOCKER_SERVICE="localhost" ; export DOCKER_HOST="tcp://${DOCKER_SERVICE}:2375" ; } fi - | if [[ -n "$CI_REGISTRY_USER" ]]; then echo "Logging to GitLab Container Registry with CI credentials..." |