gitlab: 13.5.1 -> 13.6.0

Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9).
This commit is contained in:
Milan Pässler
2020-11-21 01:38:35 +01:00
parent 0f82bd767b
commit 2429d5a307
17 changed files with 505 additions and 471 deletions
@@ -24,9 +24,7 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
ast (2.4.1)
binding_ninja (0.2.3)
builder (3.2.4)
charlock_holmes (0.7.7)
@@ -35,11 +33,8 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.7)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.9.0)
escape_utils (1.2.1)
@@ -67,11 +62,11 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-labkit (0.12.0)
gitlab-labkit (0.13.2)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
@@ -82,17 +77,15 @@ GEM
google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.30.2)
hashdiff (0.3.9)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (0.10.0)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.3.1)
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
@@ -114,8 +107,8 @@ GEM
opentracing (0.5.0)
optimist (3.0.1)
parallel (1.19.2)
parser (2.7.0.5)
ast (~> 2.4.0)
parser (2.7.2.0)
ast (~> 2.4.1)
proc_to_ast (0.1.0)
coderay
parser
@@ -124,7 +117,6 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@ -175,18 +167,12 @@ GEM
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
rugged (0.28.4.1)
safe_yaml (1.0.5)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sentry-raven (3.0.4)
faraday (>= 1.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
stringex (2.8.5)
thread_safe (0.3.6)
thrift (0.11.0.0)
@@ -202,11 +188,6 @@ GEM
equalizer (~> 0.0.9)
parser (>= 2.6.5)
procto (~> 0.0.2)
vcr (4.0.0)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
zeitwerk (2.4.0)
PLATFORMS
@@ -214,19 +195,17 @@ PLATFORMS
DEPENDENCIES
activesupport (~> 6.0.3.3)
bundler (>= 1.17.3)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.11)
gitlab-gollum-lib (~> 4.2.7.9)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.12.0)
gitlab-labkit (~> 0.13.2)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.12)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
rdoc (~> 6.0)
@@ -235,10 +214,7 @@ DEPENDENCIES
rubocop (~> 0.69)
rugged (~> 0.28)
sentry-raven (~> 3.0)
simplecov (~> 0.17.1)
timecop
vcr (~> 4.0.0)
webmock (~> 3.4.0)
BUNDLED WITH
2.1.4