Merge commit '96637859da4d' into object-storage-ee-to-ce-backport
Too many changes to show.
To preserve performance only 20 of 1000+ files are displayed.
... | ... | @@ -23,10 +23,10 @@ gem 'faraday', '~> 0.12' |
# Authentication libraries | ||
gem 'devise', '~> 4.2' | ||
gem 'doorkeeper', '~> 4.2.0' | ||
gem 'doorkeeper-openid_connect', '~> 1.1.0' | ||
gem 'doorkeeper-openid_connect', '~> 1.2.0' | ||
gem 'omniauth', '~> 1.4.2' | ||
gem 'omniauth-auth0', '~> 1.4.1' | ||
gem 'omniauth-azure-oauth2', '~> 0.0.6' | ||
gem 'omniauth-azure-oauth2', '~> 0.0.9' | ||
gem 'omniauth-cas3', '~> 1.1.4' | ||
gem 'omniauth-facebook', '~> 4.0.0' | ||
gem 'omniauth-github', '~> 1.1.1' | ||
... | ... | @@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1' |
gem 'fog-aliyun', '~> 0.1.0' | ||
# for Google storage | ||
gem 'google-api-client', '~> 0.8.6' | ||
gem 'google-api-client', '~> 0.13.6' | ||
# for aws storage | ||
gem 'unf', '~> 0.1.4' | ||
... | ... | @@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | ||
gem 'deckar01-task_list', '2.0.0' | ||
gem 'gitlab-markup', '~> 1.5.1' | ||
gem 'gitlab-markup', '~> 1.6.2' | ||
gem 'redcarpet', '~> 3.4' | ||
gem 'RedCloth', '~> 4.3.2' | ||
gem 'rdoc', '~> 4.2' | ||
... | ... | @@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7' |
gem 'rouge', '~> 2.0' | ||
gem 'truncato', '~> 0.7.9' | ||
gem 'bootstrap_form', '~> 2.7.0' | ||
gem 'nokogiri', '~> 1.8.0' | ||
gem 'nokogiri', '~> 1.8.1' | ||
# Diffs | ||
gem 'diffy', '~> 3.1.0' | ||
... | ... | @@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0' |
gem 'sass-rails', '~> 5.0.6' | ||
gem 'uglifier', '~> 2.7.2' | ||
gem 'addressable', '~> 2.3.8' | ||
gem 'addressable', '~> 2.5.2' | ||
gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.7' | ||
gem 'gemojione', '~> 3.3' | ||
... | ... | @@ -356,12 +356,13 @@ end |
group :test do | ||
gem 'shoulda-matchers', '~> 3.1.2', require: false | ||
gem 'email_spec', '~> 1.6.0' | ||
gem 'json-schema', '~> 2.6.2' | ||
gem 'json-schema', '~> 2.8.0' | ||
gem 'webmock', '~> 2.3.2' | ||
gem 'test_after_commit', '~> 1.1' | ||
gem 'sham_rack', '~> 1.3.6' | ||
gem 'timecop', '~> 0.8.0' | ||
gem 'concurrent-ruby', '~> 1.0.5' | ||
gem 'test-prof', '~> 0.2.5' | ||
end | ||
gem 'octokit', '~> 4.6.2' | ||
... | ... | @@ -397,7 +398,7 @@ group :ed25519 do |
end | ||
# Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly' | ||
gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' | ||
gem 'toml-rb', '~> 0.3.15', require: false | ||
... | ... | @@ -407,4 +408,4 @@ gem 'flipper-active_record', '~> 0.10.2' |
# Structured logging | ||
gem 'lograge', '~> 0.5' | ||
gem 'grape_logging', '~> 1.6' | ||
gem 'grape_logging', '~> 1.7' |