Merge branch 'master' into ee-38869-groups-select
* master: (139 commits) btn-small -> btn-sm Merge branch 'fix-application-setting-nil-cache' into 'master' no CI replication [CE->EE] Resove frontent conflicts [CE->EE] Fix wrong resolvation of specs [CE->EE] Resolve group routes [CE->EE][ci skip] Resolve conflicts Resolve conflict in lib/backup/manager.rb Resolve conflict in .gitlab-ci.yml [CE->EE][ci skip] Resolve conflicts [CE->EE][ci skip] resolve frontend conflicts Remove `<script>` and `<template>` from CHANGELOG.md Simple docs fixes Fix button type Changes after review Removes group_avatar & group_label_subscription from global namespace Fix CSS in load more participants Fix the description of the new branch created by an issue's new branch button Fix a small typo in the delete merged branches documentation Moves vue resource docs into a new file. Adds docs regarding handling 204 response ...
Showing
... | @@ -105,7 +105,7 @@ gem 'fog-google', '~> 0.5' | ... | @@ -105,7 +105,7 @@ gem 'fog-google', '~> 0.5' |
gem 'fog-local', '~> 0.3' | gem 'fog-local', '~> 0.3' | ||
gem 'fog-openstack', '~> 0.1' | gem 'fog-openstack', '~> 0.1' | ||
gem 'fog-rackspace', '~> 0.1.1' | gem 'fog-rackspace', '~> 0.1.1' | ||
gem 'fog-aliyun', '~> 0.1.0' | gem 'fog-aliyun', '~> 0.2.0' | ||
# for Google storage | # for Google storage | ||
gem 'google-api-client', '~> 0.13.6' | gem 'google-api-client', '~> 0.13.6' | ||
... | @@ -414,7 +414,7 @@ group :ed25519 do | ... | @@ -414,7 +414,7 @@ group :ed25519 do |
end | end | ||
# Gitaly GRPC client | # Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly' | gem 'gitaly-proto', '~> 0.45.0', require: 'gitaly' | ||
gem 'toml-rb', '~> 0.3.15', require: false | gem 'toml-rb', '~> 0.3.15', require: false | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/policy/maintenance.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/peek/views/gitaly.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.