Merge branch 'master' into 'bootstrap4'
# Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml
... | ... | @@ -384,6 +384,7 @@ group :test do |
gem 'email_spec', '~> 1.6.0' | ||
gem 'json-schema', '~> 2.8.0' | ||
gem 'webmock', '~> 2.3.2' | ||
gem 'rails-controller-testing' if rails5? # Rails5 only gem. | ||
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. | ||
gem 'sham_rack', '~> 1.3.6' | ||
gem 'concurrent-ruby', '~> 1.0.5' | ||
... | ... | @@ -421,7 +422,7 @@ group :ed25519 do |
end | ||
# Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.91.0', require: 'gitaly' | ||
gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly' | ||
gem 'grpc', '~> 1.10.0' | ||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
... | ... | @@ -440,3 +441,5 @@ gem 'grape_logging', '~> 1.7' |
# Asset synchronization | ||
gem 'asset_sync', '~> 2.2.0' | ||
gem 'goldiloader', '~> 2.0' |