diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-21 17:17:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-21 17:17:12 +0000 |
| commit | 576dd646c8436641f03a5b94e1daaecbe90b78c5 (patch) | |
| tree | 173097ad145efde68ffba4aabcea07b6213e5134 /Gemfile.lock | |
| parent | 94ac29f66d78e949b50e353c8ba4827bd33084ce (diff) | |
| parent | c5e385bd5a0274e4d40e647eadcb22043f0f6e92 (diff) | |
| download | gitlab-ce-576dd646c8436641f03a5b94e1daaecbe90b78c5.tar.gz | |
Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'
Resolve "[Gem Update] update toml-rb to 1.0.0"
Closes #36847
See merge request gitlab-org/gitlab-ce!17259
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 32c35353a74..57ff086f0b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -924,7 +924,7 @@ GEM timfel-krb5-auth (0.8.3) toml (0.1.2) parslet (~> 1.5.0) - toml-rb (0.3.15) + toml-rb (1.0.0) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) @@ -1201,7 +1201,7 @@ DEPENDENCIES test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) - toml-rb (~> 0.3.15) + toml-rb (~> 1.0.0) truncato (~> 0.7.9) u2f (~> 0.2.1) uglifier (~> 2.7.2) |