diff options
author | Ken <ken.ding@mail.com> | 2018-02-21 14:39:15 +0300 |
---|---|---|
committer | Ken <ken.ding@mail.com> | 2018-02-21 14:39:15 +0300 |
commit | c5e385bd5a0274e4d40e647eadcb22043f0f6e92 (patch) | |
tree | a9511c00db844be6ad459c0547c445e947275584 /lib | |
parent | 216d21c5496fb7e7666c3c3e7ebbdff1e8fd0493 (diff) |
36847 - update toml-rb to 1.0.0
36847 - add changelog
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/setup_helper.rb | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index e90a90508a2..07d7c91cb5d 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -37,7 +37,7 @@ module Gitlab config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:bin_dir] = Gitlab.config.gitaly.client_path - TOML.dump(config) + TomlRB.dump(config) end # rubocop:disable Rails/Output diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index 107ff1d8aeb..e9ca6404fe8 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -2,7 +2,7 @@ namespace :gitlab do namespace :gitaly do desc "GitLab | Install or upgrade gitaly" task :install, [:dir, :repo] => :gitlab_environment do |t, args| - require 'toml' + require 'toml-rb' warn_user_is_not_gitlab @@ -38,7 +38,7 @@ namespace :gitlab do desc "GitLab | Print storage configuration in TOML format" 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 "# This is in TOML format suitable for use in Gitaly's config.toml file." |