gitlab: 11.10.8 -> 12.0.3
This is a major version bump but things were generally straightforward save two wrinkles: * it is necessary to ignore collisions in the gitlab bundler environment as both `omniauth_oauth2_generic` and `apollo_upload_server` provide a `console` executable. * grpc had to be patched since its build system expects the `AR` environment variable to contain not just the path to `ar` but also the `rpc` flags (see the discussion in nixpkgs #63056).
This commit is contained in:
Ben Gamari
committed by
Florian Klink
Florian Klink
parent
acb1134074
commit
363b352af3
@@ -2,7 +2,20 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
activesupport (5.0.7.2)
|
||||
actionpack (5.1.7)
|
||||
actionview (= 5.1.7)
|
||||
activesupport (= 5.1.7)
|
||||
rack (~> 2.0)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (5.1.7)
|
||||
activesupport (= 5.1.7)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activesupport (5.1.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
@@ -10,33 +23,33 @@ GEM
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.5.2)
|
||||
addressable (2.6.0)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
ast (2.4.0)
|
||||
binding_of_caller (0.8.0)
|
||||
debug_inspector (>= 0.0.1)
|
||||
binding_ninja (0.2.3)
|
||||
builder (3.2.3)
|
||||
charlock_holmes (0.7.6)
|
||||
coderay (1.1.2)
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.3)
|
||||
concurrent-ruby (1.1.5)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
crass (1.0.4)
|
||||
debug_inspector (0.0.3)
|
||||
diff-lcs (1.3)
|
||||
docile (1.1.5)
|
||||
equalizer (0.0.11)
|
||||
erubi (1.8.0)
|
||||
escape_utils (1.2.1)
|
||||
factory_bot (4.11.1)
|
||||
activesupport (>= 3.0.0)
|
||||
faraday (0.15.3)
|
||||
factory_bot (5.0.2)
|
||||
activesupport (>= 4.2.0)
|
||||
faraday (0.15.4)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.10.0)
|
||||
gemojione (3.3.0)
|
||||
json
|
||||
gitaly-proto (1.22.0)
|
||||
gitaly-proto (1.32.0)
|
||||
grpc (~> 1.0)
|
||||
github-linguist (6.4.1)
|
||||
charlock_holmes (~> 0.7.6)
|
||||
@@ -60,44 +73,57 @@ GEM
|
||||
diff-lcs (~> 1.1)
|
||||
mime-types (>= 1.16)
|
||||
posix-spawn (~> 0.3)
|
||||
gitlab-labkit (0.3.0)
|
||||
actionpack (~> 5)
|
||||
activesupport (~> 5)
|
||||
grpc (~> 1.19.0)
|
||||
jaeger-client (~> 0.10)
|
||||
opentracing (~> 0.4)
|
||||
gitlab-markup (1.7.0)
|
||||
gollum-grit_adapter (1.0.1)
|
||||
gitlab-grit (~> 2.7, >= 2.7.1)
|
||||
google-protobuf (3.7.1)
|
||||
googleapis-common-protos-types (1.0.4)
|
||||
google-protobuf (~> 3.0)
|
||||
grpc (1.15.0)
|
||||
grpc (1.19.0)
|
||||
google-protobuf (~> 3.1)
|
||||
googleapis-common-protos-types (~> 1.0.0)
|
||||
hashdiff (0.3.8)
|
||||
hashdiff (0.3.9)
|
||||
i18n (1.6.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
jaeger-client (0.10.0)
|
||||
opentracing (~> 0.3)
|
||||
thrift
|
||||
jaro_winkler (1.5.2)
|
||||
json (2.2.0)
|
||||
licensee (8.9.2)
|
||||
rugged (~> 0.24)
|
||||
listen (0.5.3)
|
||||
loofah (2.2.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
method_source (0.9.2)
|
||||
mime-types (3.2.2)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2018.0812)
|
||||
mime-types-data (3.2019.0331)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.11.3)
|
||||
msgpack (1.2.6)
|
||||
msgpack (1.2.10)
|
||||
multi_json (1.13.1)
|
||||
multipart-post (2.0.0)
|
||||
nokogiri (1.10.2)
|
||||
nokogiri (1.10.3)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (1.5.0)
|
||||
nokogiri
|
||||
opentracing (0.5.0)
|
||||
optimist (3.0.0)
|
||||
parallel (1.12.1)
|
||||
parser (2.5.3.0)
|
||||
parallel (1.17.0)
|
||||
parser (2.6.3.0)
|
||||
ast (~> 2.4.0)
|
||||
posix-spawn (0.3.13)
|
||||
powerpack (0.1.2)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
parser
|
||||
@@ -107,6 +133,14 @@ GEM
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
public_suffix (3.0.3)
|
||||
rack (2.0.7)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
rainbow (3.0.0)
|
||||
rbtrace (0.4.11)
|
||||
ffi (>= 1.0.6)
|
||||
@@ -114,35 +148,35 @@ GEM
|
||||
optimist (>= 3.0.0)
|
||||
rdoc (4.3.0)
|
||||
rouge (3.3.0)
|
||||
rspec (3.7.0)
|
||||
rspec-core (~> 3.7.0)
|
||||
rspec-expectations (~> 3.7.0)
|
||||
rspec-mocks (~> 3.7.0)
|
||||
rspec-core (3.7.1)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-expectations (3.7.0)
|
||||
rspec (3.8.0)
|
||||
rspec-core (~> 3.8.0)
|
||||
rspec-expectations (~> 3.8.0)
|
||||
rspec-mocks (~> 3.8.0)
|
||||
rspec-core (3.8.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-expectations (3.8.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-mocks (3.7.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-mocks (3.8.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-parameterized (0.4.0)
|
||||
binding_of_caller
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-parameterized (0.4.2)
|
||||
binding_ninja (>= 0.2.3)
|
||||
parser
|
||||
proc_to_ast
|
||||
rspec (>= 2.13, < 4)
|
||||
unparser
|
||||
rspec-support (3.7.1)
|
||||
rubocop (0.54.0)
|
||||
rspec-support (3.8.0)
|
||||
rubocop (0.69.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.5)
|
||||
powerpack (~> 0.1)
|
||||
parser (>= 2.6)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
unicode-display_width (>= 1.4.0, < 1.7)
|
||||
ruby-progressbar (1.10.0)
|
||||
rugged (0.28.1)
|
||||
safe_yaml (1.0.4)
|
||||
safe_yaml (1.0.5)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
@@ -156,17 +190,18 @@ GEM
|
||||
simplecov-html (0.9.0)
|
||||
stringex (2.8.5)
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.11.0.0)
|
||||
timecop (0.9.1)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (1.4.0)
|
||||
unparser (0.2.8)
|
||||
unicode-display_width (1.6.0)
|
||||
unparser (0.4.5)
|
||||
abstract_type (~> 0.0.7)
|
||||
adamantium (~> 0.2.0)
|
||||
concord (~> 0.1.5)
|
||||
diff-lcs (~> 1.3)
|
||||
equalizer (~> 0.0.9)
|
||||
parser (>= 2.3.1.2, < 2.6)
|
||||
parser (~> 2.6.3)
|
||||
procto (~> 0.0.2)
|
||||
vcr (4.0.0)
|
||||
webmock (3.4.2)
|
||||
@@ -178,17 +213,18 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport (~> 5.0.2)
|
||||
bundler (>= 1.16.5)
|
||||
activesupport (~> 5.1.7)
|
||||
bundler (>= 1.17.3)
|
||||
factory_bot
|
||||
faraday (~> 0.12)
|
||||
gitaly-proto (~> 1.22.0)
|
||||
gitaly-proto (~> 1.32.0)
|
||||
github-linguist (~> 6.1)
|
||||
gitlab-gollum-lib (~> 4.2.7.7)
|
||||
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
|
||||
gitlab-labkit (~> 0.3.0)
|
||||
gitlab-markup (~> 1.7.0)
|
||||
google-protobuf (~> 3.6)
|
||||
grpc (~> 1.15.0)
|
||||
google-protobuf (~> 3.7.1)
|
||||
grpc (~> 1.19.0)
|
||||
licensee (~> 8.9.0)
|
||||
listen (~> 0.5.0)
|
||||
pry (~> 0.12.2)
|
||||
@@ -196,7 +232,7 @@ DEPENDENCIES
|
||||
rdoc (~> 4.2)
|
||||
rspec
|
||||
rspec-parameterized
|
||||
rubocop (~> 0.50)
|
||||
rubocop (~> 0.69)
|
||||
rugged (~> 0.28)
|
||||
sentry-raven (~> 2.9.0)
|
||||
simplecov (~> 0.9.0)
|
||||
|
||||
Reference in New Issue
Block a user