From 02afda3fd856378571fefc101119ae88c7ea4158 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 23 Oct 2018 12:24:11 +0200 Subject: [PATCH] gitlab: 11.3.4 -> 11.4.0 --- .../version-management/gitlab/default.nix | 10 +- .../gitlab/rubyEnv-ce/Gemfile | 17 +-- .../gitlab/rubyEnv-ce/Gemfile.lock | 62 ++++------ .../gitlab/rubyEnv-ce/gemset.nix | 111 +++++++----------- .../gitlab/rubyEnv-ee/Gemfile | 17 +-- .../gitlab/rubyEnv-ee/Gemfile.lock | 62 ++++------ .../gitlab/rubyEnv-ee/gemset.nix | 111 +++++++----------- 7 files changed, 151 insertions(+), 239 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c1a4392ec0ef..ba37091c433f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.3.4"; + version = "11.4.0"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd"; + sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4"; + sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7"; + sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c"; + sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k"; }; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f14e05d43e06..ecbfba0827d2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -425,7 +420,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index e41719ec79d3..9837a195d8c7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -86,7 +86,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -133,14 +133,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -175,8 +175,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -189,7 +187,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -276,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -297,15 +295,14 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -343,7 +340,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -493,7 +490,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -501,7 +498,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -605,10 +602,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -633,9 +626,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -649,7 +642,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -735,7 +728,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -843,16 +836,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -865,7 +855,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -895,7 +885,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -954,7 +944,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1013,7 +1003,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) @@ -1038,19 +1027,20 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1114,7 +1104,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1166,9 +1155,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 65aac9891037..ee262b6b5d96 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -301,10 +301,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -504,10 +504,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -546,10 +546,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -695,15 +695,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -773,10 +764,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1078,10 +1069,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1118,15 +1109,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1144,6 +1126,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1237,10 +1228,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1779,10 +1770,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1843,10 +1834,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2207,15 +2198,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2314,18 +2296,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2382,10 +2364,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2699,10 +2681,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3072,13 +3054,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3089,15 +3071,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3144,10 +3117,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3288,10 +3261,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3518,10 +3491,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 86502db9d26e..ef14aace277e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -440,7 +435,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c4f80efd15..4355b3ae2717 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -94,7 +94,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -141,14 +141,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -183,8 +183,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) elasticsearch (5.0.3) elasticsearch-api (= 5.0.3) @@ -210,7 +208,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -300,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -321,9 +319,6 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -331,6 +326,8 @@ GEM posix-spawn (~> 0.3) gitlab-license (1.0.0) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -368,7 +365,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -521,7 +518,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -529,7 +526,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -634,10 +631,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -662,9 +655,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -678,7 +671,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -764,7 +757,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -872,16 +865,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -894,7 +884,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -924,7 +914,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -983,7 +973,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1043,7 +1033,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) elasticsearch-api (= 5.0.3) elasticsearch-model (~> 0.1.9) @@ -1072,20 +1061,21 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1151,7 +1141,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1203,9 +1192,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index a067d1e42722..03efc4e9600f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -336,10 +336,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -539,10 +539,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -581,10 +581,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -730,15 +730,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -852,10 +843,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1166,10 +1157,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1206,15 +1197,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1240,6 +1222,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1333,10 +1324,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1892,10 +1883,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1956,10 +1947,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2328,15 +2319,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2435,18 +2417,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2503,10 +2485,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2820,10 +2802,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3193,13 +3175,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3210,15 +3192,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3265,10 +3238,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3409,10 +3382,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3639,10 +3612,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"];