Commit c5e385bd authored by Ken's avatar Ken

36847 - update toml-rb to 1.0.0


36847 - add changelog
parent 216d21c5
...@@ -415,7 +415,7 @@ gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' ...@@ -415,7 +415,7 @@ gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
# Locked until https://github.com/google/protobuf/issues/4210 is closed # Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1' gem 'google-protobuf', '= 3.5.1'
gem 'toml-rb', '~> 0.3.15', require: false gem 'toml-rb', '~> 1.0.0', require: false
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.11.0' gem 'flipper', '~> 0.11.0'
......
...@@ -924,7 +924,7 @@ GEM ...@@ -924,7 +924,7 @@ GEM
timfel-krb5-auth (0.8.3) timfel-krb5-auth (0.8.3)
toml (0.1.2) toml (0.1.2)
parslet (~> 1.5.0) parslet (~> 1.5.0)
toml-rb (0.3.15) toml-rb (1.0.0)
citrus (~> 3.0, > 3.0) citrus (~> 3.0, > 3.0)
truncato (0.7.10) truncato (0.7.10)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
...@@ -1201,7 +1201,7 @@ DEPENDENCIES ...@@ -1201,7 +1201,7 @@ DEPENDENCIES
test_after_commit (~> 1.1) test_after_commit (~> 1.1)
thin (~> 1.7.0) thin (~> 1.7.0)
timecop (~> 0.8.0) timecop (~> 0.8.0)
toml-rb (~> 0.3.15) toml-rb (~> 1.0.0)
truncato (~> 0.7.9) truncato (~> 0.7.9)
u2f (~> 0.2.1) u2f (~> 0.2.1)
uglifier (~> 2.7.2) uglifier (~> 2.7.2)
......
---
title: update toml-rb to 1.0.0
merge_request: 17259
author: Ken Ding
type: other
...@@ -37,7 +37,7 @@ module Gitlab ...@@ -37,7 +37,7 @@ module Gitlab
config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
config[:bin_dir] = Gitlab.config.gitaly.client_path config[:bin_dir] = Gitlab.config.gitaly.client_path
TOML.dump(config) TomlRB.dump(config)
end end
# rubocop:disable Rails/Output # rubocop:disable Rails/Output
......
...@@ -2,7 +2,7 @@ namespace :gitlab do ...@@ -2,7 +2,7 @@ namespace :gitlab do
namespace :gitaly do namespace :gitaly do
desc "GitLab | Install or upgrade gitaly" desc "GitLab | Install or upgrade gitaly"
task :install, [:dir, :repo] => :gitlab_environment do |t, args| task :install, [:dir, :repo] => :gitlab_environment do |t, args|
require 'toml' require 'toml-rb'
warn_user_is_not_gitlab warn_user_is_not_gitlab
...@@ -38,7 +38,7 @@ namespace :gitlab do ...@@ -38,7 +38,7 @@ namespace :gitlab do
desc "GitLab | Print storage configuration in TOML format" desc "GitLab | Print storage configuration in TOML format"
task storage_config: :environment do task storage_config: :environment do
require 'toml' require 'toml-rb'
puts "# Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}" puts "# Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}"
puts "# This is in TOML format suitable for use in Gitaly's config.toml file." puts "# This is in TOML format suitable for use in Gitaly's config.toml file."
......
require 'rspec/mocks' require 'rspec/mocks'
require 'toml' require 'toml-rb'
module TestEnv module TestEnv
extend self extend self
......
...@@ -132,7 +132,7 @@ describe 'gitlab:gitaly namespace rake task' do ...@@ -132,7 +132,7 @@ describe 'gitlab:gitaly namespace rake task' do
expect { run_rake_task('gitlab:gitaly:storage_config')} expect { run_rake_task('gitlab:gitaly:storage_config')}
.to output(expected_output).to_stdout .to output(expected_output).to_stdout
parsed_output = TOML.parse(expected_output) parsed_output = TomlRB.parse(expected_output)
config.each do |name, params| config.each do |name, params|
expect(parsed_output['storage']).to include({ 'name' => name, 'path' => params['path'] }) expect(parsed_output['storage']).to include({ 'name' => name, 'path' => params['path'] })
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment