Changeset View
Changeset View
Standalone View
Standalone View
devel/gitaly/files/patch-ruby_Gemfile
--- ruby/Gemfile.orig 2018-06-20 08:20:28 UTC | --- ruby/Gemfile.orig 2018-06-04 16:17:50 UTC | ||||
+++ ruby/Gemfile | +++ ruby/Gemfile | ||||
@@ -8,7 +8,7 @@ gem 'activesupport', '~> 5.0.2' | @@ -5,12 +5,13 @@ gem 'github-linguist', '~> 5.3.3', requi | ||||
gem 'rdoc', '~> 4.2' | gem 'gitlab-markup', '~> 1.6.2' | ||||
gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' | |||||
gem 'activesupport', '~> 5.0.2' | |||||
-gem 'rdoc', '~> 4.2' | |||||
+gem 'rdoc', '~> 6.0' | |||||
gem 'gitlab-gollum-lib', '~> 4.2', require: false | gem 'gitlab-gollum-lib', '~> 4.2', require: false | ||||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false | gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false | ||||
-gem 'grpc', '~> 1.10.0' | gem 'grpc', '~> 1.11.0' | ||||
+gem 'grpc', '~> 1.11.0' | |||||
gem 'sentry-raven', '~> 2.7.2', require: false | gem 'sentry-raven', '~> 2.7.2', require: false | ||||
gem 'faraday', '~> 0.12' | |||||
+gem 'i18n' | |||||
# Detects the open source license the repository includes | # Detects the open source license the repository includes | ||||
@@ -18,7 +18,3 @@ gem 'licensee', '~> 8.9.0' | # This version needs to be in sync with GitLab CE/EE | ||||
@@ -18,8 +19,3 @@ gem 'licensee', '~> 8.9.0' | |||||
# 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' | ||||
- | |||||
-group :development, :test do | -group :development, :test do | ||||
- gem 'gitlab-styles', '~> 2.0.0', require: false | - gem 'gitlab-styles', '~> 2.0.0', require: false | ||||
- gem 'rspec', require: false | - gem 'rspec', require: false | ||||
-end | -end |