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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -415,7 +415,7 @@ gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' -gem 'toml-rb', '~> 0.3.15', require: false +gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles gem 'flipper', '~> 0.11.0' |