Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2021-06-02 04:57:31 +0300
committerTakuya Noguchi <takninnovationresearch@gmail.com>2021-06-08 08:50:41 +0300
commitd648efdf1a0b71403b9dcbbb821f7fe122d32c10 (patch)
tree2ca83f51f14b7336f50464862c55f130caca478a
parent3d7ad95c236e60009d1d1a3ba6a97bec12baabb6 (diff)
Update activesupport to 6.1.3.2 to get close to support Ruby 3.0activesupport-6.1.3.2
Changelog: changed Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--gitaly.gemspec1
-rw-r--r--ruby/Gemfile1
-rw-r--r--ruby/Gemfile.lock29
3 files changed, 15 insertions, 16 deletions
diff --git a/gitaly.gemspec b/gitaly.gemspec
index 80095c4ce..1f030d40e 100644
--- a/gitaly.gemspec
+++ b/gitaly.gemspec
@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z #{prefix}`.split("\x0").reject { |f| f.match(%r{^#{prefix}/(test|spec|features)/}) }
spec.require_paths = [prefix]
+ spec.add_dependency "activesupport"
spec.add_dependency "grpc", "~> 1.0"
end
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 20f1034fc..9989752fe 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
gem 'rugged', '~> 1.1'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.0.3.6'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index af6a3ce81..581162115 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
- actionpack (6.0.3.6)
- actionview (= 6.0.3.6)
- activesupport (= 6.0.3.6)
- rack (~> 2.0, >= 2.0.8)
+ actionpack (6.1.3.2)
+ actionview (= 6.1.3.2)
+ activesupport (= 6.1.3.2)
+ rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actionview (6.0.3.6)
- activesupport (= 6.0.3.6)
+ actionview (6.1.3.2)
+ activesupport (= 6.1.3.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activesupport (6.0.3.6)
+ activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ zeitwerk (~> 2.3)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -105,7 +105,7 @@ GEM
mime-types-data (3.2020.1104)
mini_mime (1.0.2)
mini_portile2 (2.5.1)
- minitest (5.14.2)
+ minitest (5.14.4)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.11.5)
@@ -199,8 +199,8 @@ GEM
thread_safe (0.3.6)
thrift (0.14.1)
timecop (0.9.1)
- tzinfo (1.2.9)
- thread_safe (~> 0.1)
+ tzinfo (2.0.4)
+ concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
unparser (0.4.7)
abstract_type (~> 0.0.7)
@@ -216,7 +216,6 @@ PLATFORMS
ruby
DEPENDENCIES
- activesupport (~> 6.0.3.6)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.12)