diff --git a/debian/control b/debian/control index 0597b5a047..55de7f042f 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Section: contrib/net Architecture: all XB-Ruby-Versions: ${ruby:Versions} Depends: ${shlibs:Depends}, ${misc:Depends}, - gitlab-common (>= 12.9.2~), + gitlab-common (>= 13.0.0~), ruby (>= 1:2.5~), lsb-base (>= 3.0-6), rake (>= 12.3.0~), @@ -36,9 +36,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client, bzip2, ucf, - gitlab-workhorse (>= 8.30.1~), - ruby-rails (>= 2:6.0.2.1+dfsg-3~), - ruby-bootsnap (>= 1.4~), + gitlab-workhorse (>= 8.32~), + ruby-rails (>= 2:6.0.3~), + ruby-bootsnap (>= 1.4.6~), ruby-nakayoshi-fork (>= 0.0.4~), ruby-responders (>= 3.0~), ruby-sprockets (>= 3.7~), @@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-marginalia (>= 1.8~), # Authentication libraries ruby-devise (>= 4.7.1~), - ruby-doorkeeper (>= 5~), + ruby-doorkeeper (>= 5.0.3~), ruby-doorkeeper-openid-connect (>= 1.6.3~), ruby-omniauth (>= 1.8~), ruby-omniauth-auth0 (>= 2.0~), @@ -97,6 +97,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-net-ldap (>= 0.16.1~), # API ruby-grape (>= 1.3~), + ruby-rack-timeout, ruby-grape-entity (>= 0.7.1~), ruby-rack-cors (>= 1.0.6~), # GraphQL API @@ -148,8 +149,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-wikicloth (>= 0.8.1~), asciidoctor (>= 2.0.10~), ruby-asciidoctor-include-ext (>= 0.3.1~), - ruby-asciidoctor-plantuml (>= 0.0.10~), - ruby-rouge (>= 3.18~), + ruby-asciidoctor-plantuml (>= 0.0.12~), + ruby-rouge (>= 3.19~), ruby-truncato (>= 0.7.11~), ruby-bootstrap-form (>= 4.2~), ruby-nokogiri (>= 1.10.9~), @@ -164,7 +165,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # `config.ru`. This can be removed once a new update for Rack # is available that contains https://github.com/rack/rack/pull/1201 ruby-rack (>= 2.1~), - unicorn (>= 5.4~), + unicorn (>= 5.5~), ruby-kgio (>= 2.11.2~), ruby-unicorn-worker-killer (>= 0.4.4~), # State machine @@ -188,7 +189,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # GitLab settings ruby-settingslogic (>= 2.0.9~), # Linear-time regex library for untrusted regular expressions - ruby-re2 (>= 1.1.1~), + ruby-re2 (>= 1.2~), # Misc ruby-version-sorter (>= 2.2.4~), # Export Ruby Regex to Javascript @@ -207,7 +208,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # HipChat integration ruby-hipchat (>= 1.5~), # JIRA integration - ruby-jira (>= 1.7.1~), + ruby-jira (>= 2.0~), # Flowdock integration ruby-flowdock (>= 0.7~), ruby-posix-spawn (>= 0.3.13~), @@ -229,7 +230,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Working with license ruby-licensee (>= 8.9~), # Protect against bruteforcing - ruby-rack-attack (>= 6.2~), + ruby-rack-attack (>= 6.3~), # Ace editor ruby-ace-rails-ap (>= 4.1~), # Detect and convert string character encoding @@ -257,6 +258,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-font-awesome-rails (>= 4.7.0.5~), ruby-gemojione (>= 3.3~), ruby-gon (>= 6.2~), + ruby-request-store (>= 1.5~), ruby-jquery-atwho-rails (>= 1.3.2~), ruby-virtus (>= 1.0.5-3~), ruby-base32 (>= 0.3.0~), @@ -288,7 +290,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-octokit (>= 4.15~), # - ruby-mail-room (>= 0.10.0+really0.0.3~), + ruby-mail-room (>= 0.10.0+really0.0.4~), # ruby-email-reply-trimmer (>= 0.1~), ruby-html2text, @@ -340,6 +342,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-mail (>= 2.7.1), # File encryption ruby-lockbox (>= 0.3.3~), +# Email validation + ruby-valid-email, +# JSON + ruby-json (>= 2.3~), # packaged node modules - all node packages are not packaged yet node-autosize (>= 4.0~), node-axios (>= 0.17.1~), diff --git a/debian/patches/0760-update-grape.patch b/debian/patches/0760-update-grape.patch index 859d2641fe..576119d0d2 100644 --- a/debian/patches/0760-update-grape.patch +++ b/debian/patches/0760-update-grape.patch @@ -205,6 +205,14 @@ coerced to arrays of integers. Before this was done within Virtus. gem 'faraday', '~> 0.12' gem 'marginalia', '~> 1.8' +@@ -80,6 +80,7 @@ + + # API + gem 'grape', '~> 1.1' ++gem 'rack-timeout' + gem 'grape-entity', '~> 0.7.1' + gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' + --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,10 +103,6 @@