diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-17 13:33:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-17 13:33:14 +0000 |
| commit | 73431ad0d1c429ec3b6f3457adbdc062e7ce69b4 (patch) | |
| tree | 046a6673b02d786b37c10f78d45c3a5e57c90ee3 | |
| parent | 2be8b01b5d34884475d3061108efa8bba8798a21 (diff) | |
| parent | 27fa110ea5652807cef619cc459cafff804b23be (diff) | |
| download | gitlab-ce-73431ad0d1c429ec3b6f3457adbdc062e7ce69b4.tar.gz | |
Merge branch 'fix/gb/fix-empty-secret-variables' into 'master'
Fix a case with empty secret CI/CD variables
Closes #31929
See merge request gitlab-org/gitlab-ce!18400
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-gb-fix-empty-secret-variables.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -62,7 +62,7 @@ gem 'akismet', '~> 2.0' # Two-factor authentication gem 'devise-two-factor', '~> 3.0.0' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.0.0' +gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' # GitLab Pages diff --git a/Gemfile.lock b/Gemfile.lock index bbe3c9e49b8..7f243491c90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM unf ast (2.4.0) atomic (1.1.99) - attr_encrypted (3.0.3) + attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.0) autoprefixer-rails (6.2.3) @@ -1004,7 +1004,7 @@ DEPENDENCIES asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) - attr_encrypted (~> 3.0.0) + attr_encrypted (~> 3.1.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) diff --git a/changelogs/unreleased/fix-gb-fix-empty-secret-variables.yml b/changelogs/unreleased/fix-gb-fix-empty-secret-variables.yml new file mode 100644 index 00000000000..94010c06a07 --- /dev/null +++ b/changelogs/unreleased/fix-gb-fix-empty-secret-variables.yml @@ -0,0 +1,5 @@ +--- +title: Fix a case with secret variables being empty sometimes +merge_request: 18400 +author: +type: fixed |