diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | doc/update/upgrading_from_source.md | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65fa94fe68d..c4469ea98a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,6 +171,7 @@ variables: ES_JAVA_OPTS: "-Xms256m -Xmx256m" ELASTIC_URL: "http://elastic:changeme@elasticsearch:9200" + BUNDLER_CHECKSUM_VERIFICATION_OPT_IN: "1" CACHE_CLASSES: "true" CHECK_PRECOMPILED_ASSETS: "true" FF_USE_FASTZIP: "true" @@ -186,6 +187,7 @@ variables: REVIEW_APPS_GCP_PROJECT: "gitlab-review-apps" REVIEW_APPS_GCP_REGION: "us-central1" + CACHE_ASSETS_AS_PACKAGE: "true" BUILD_ASSETS_IMAGE: "true" # Set it to "false" to disable assets image building, used in `build-assets-image` SIMPLECOV: "true" diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index 16bab1eb690..ac64321d878 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Upgrading Community Edition and Enterprise Edition from source **(FREE SELF)** -Make sure you view this update guide from the branch (version) of GitLab you +Make sure you view this upgrade guide from the branch (version) of GitLab you would like to install (for example, `11.8`). You can select the required version of documentation in the dropdown list in the upper-right corner of GitLab documentation page. In each of the following examples, replace `BRANCH` with the branch of the version you upgrading to (for example, `11-8-stable` for `11.8`). Replace `PREVIOUS_BRANCH` with the diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 86ec7c17f29..2d97608987e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5403,6 +5403,9 @@ msgstr "" msgid "ApprovalRule|Add approvers" msgstr "" +msgid "ApprovalRule|Any" +msgstr "" + msgid "ApprovalRule|Approval rules" msgstr "" @@ -5433,6 +5436,9 @@ msgstr "" msgid "ApprovalRule|Learn more about merge request approval rules." msgstr "" +msgid "ApprovalRule|More than" +msgstr "" + msgid "ApprovalRule|Name" msgstr "" @@ -39209,7 +39215,7 @@ msgstr "" msgid "ScanResultPolicy|When %{scanners} find scanner specified conditions in an open merge request targeting the %{branches} and match %{boldDescription} of the following criteria" msgstr "" -msgid "ScanResultPolicy|When %{scanners} runs against the %{branches} and find(s) more than %{vulnerabilitiesAllowed} %{boldDescription} of the following criteria:" +msgid "ScanResultPolicy|When %{scanners} runs against the %{branches} and find(s) %{vulnerabilitiesNumber} %{boldDescription} of the following criteria:" msgstr "" msgid "ScanResultPolicy|add an approver" |