Resolve conflicts with latest workflow label changes
Showing
... | ... | @@ -419,7 +419,7 @@ group :ed25519 do |
end | ||
# Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' | ||
gem 'gitaly-proto', '~> 0.102.0', require: 'gitaly' | ||
gem 'grpc', '~> 1.11.0' | ||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
... | ... |
lib/gitlab/search/parsed_query.rb
0 → 100644
lib/gitlab/search/query.rb
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录