From 88b63b2505f787ba223ad39f3f35d7cc736a38fa Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 4 Dec 2018 20:06:09 +0100 Subject: [PATCH] gitlab: 11.5.0 -> 11.5.1 --- .../version-management/gitlab/data.json | 28 ++-- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/rubyEnv-ce/Gemfile | 28 ++-- .../gitlab/rubyEnv-ce/Gemfile.lock | 82 +++------- .../gitlab/rubyEnv-ce/gemset.nix | 154 +++++------------- .../gitlab/rubyEnv-ee/Gemfile | 28 ++-- .../gitlab/rubyEnv-ee/Gemfile.lock | 82 +++------- .../gitlab/rubyEnv-ee/gemset.nix | 154 +++++------------- 8 files changed, 158 insertions(+), 402 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e2be6fb2a90..b748e7c49bd 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.5.0", - "repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb", - "deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb", + "version": "11.5.1", + "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5", + "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.5.0", + "rev": "v11.5.1", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", - "GITLAB_PAGES_VERSION": "1.3.0", + "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.1", - "GITLAB_WORKHORSE_VERSION": "7.1.0" + "GITLAB_WORKHORSE_VERSION": "7.1.3" } }, "ee": { - "version": "11.5.0", - "repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z", - "deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb", + "version": "11.5.1", + "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp", + "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.5.0-ee", + "rev": "v11.5.1-ee", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", - "GITLAB_PAGES_VERSION": "1.3.0", + "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.1", - "GITLAB_WORKHORSE_VERSION": "7.1.0" + "GITLAB_WORKHORSE_VERSION": "7.1.3" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e77dbc323a3..b0d282e8799 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "7.1.0"; + version = "7.1.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1jq28z2kf58wnbv8jkwfx2bm8ki22hpm9ssdy2ymza22gq0zx00g"; + sha256 = "1r75jj0xb4jv5fq2ihxk0vlv43gsk523zx86076mwph1g75gi1nz"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index ecbfba0827d..c7efa790cfd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -79,13 +79,6 @@ gem 'gpgme' gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' -# Git Wiki -# Only used to compute wiki page slugs -gem 'gitlab-gollum-lib', '~> 4.2', require: false - -# Language detection -gem 'github-linguist', '~> 5.3.3', require: 'linguist' - # API gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' @@ -146,6 +139,7 @@ gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' gem 'nokogiri', '~> 1.8.2' +gem 'escape_utils', '~> 1.1' # Calendar rendering gem 'icalendar' @@ -159,6 +153,11 @@ group :unicorn do gem 'unicorn-worker-killer', '~> 0.4.4' end +group :puma do + gem 'puma', '~> 3.12', require: false + gem 'puma_worker_killer', require: false +end + # State machine gem 'state_machines-activerecord', '~> 0.5.1' @@ -212,7 +211,7 @@ gem 'hipchat', '~> 1.5.0' gem 'jira-ruby', '~> 1.4' # Flowdock integration -gem 'gitlab-flowdock-git-hook', '~> 1.0.1' +gem 'flowdock', '~> 0.7' # Slack integration gem 'slack-notifier', '~> 1.5.1' @@ -245,9 +244,6 @@ gem 'rack-attack', '~> 4.4.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -# Keyboard shortcuts -gem 'mousetrap-rails', '~> 1.4.6' - # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' @@ -420,11 +416,10 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' -gem 'grpc', '~> 1.11.0' +gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly' +gem 'grpc', '~> 1.15.0' -# Locked until https://github.com/google/protobuf/issues/4210 is closed -gem 'google-protobuf', '= 3.5.1' +gem 'google-protobuf', '~> 3.6' gem 'toml-rb', '~> 1.0.0', require: false @@ -436,6 +431,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' - -# Asset synchronization -gem 'asset_sync', '~> 2.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index e215f12bbe6..db8cc34060e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -58,11 +58,6 @@ GEM asciidoctor (1.5.6.2) asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) - asset_sync (2.4.0) - activemodel (>= 4.1.0) - fog-core - mime-types (>= 2.99) - unf ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -274,32 +269,9 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.118.1) - google-protobuf (~> 3.1) - grpc (~> 1.10) - github-linguist (5.3.3) - charlock_holmes (~> 0.7.5) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.25.1) + gitaly-proto (0.123.0) + grpc (~> 1.0) github-markup (1.7.0) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-gollum-lib (4.2.7.5) - gemojione (~> 3.2) - github-markup (~> 1.6) - gollum-grit_adapter (~> 1.0) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 4.6.4) - stringex (~> 2.6) - 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) @@ -314,8 +286,6 @@ GEM rubyntlm (~> 0.5) globalid (0.4.1) activesupport (>= 4.2.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) gon (6.2.0) actionpack (>= 3.0) multi_json @@ -327,16 +297,15 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.5.1) - googleapis-common-protos-types (1.0.1) + google-protobuf (3.6.1) + googleapis-common-protos-types (1.0.2) google-protobuf (~> 3.0) - googleauth (0.6.2) + googleauth (0.6.6) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) @@ -360,10 +329,9 @@ GEM railties sprockets-rails graphql (1.8.1) - grpc (1.11.0) + grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) - googleauth (>= 0.5.1, < 0.7) haml (5.0.4) temple (>= 0.8.0) tilt @@ -465,11 +433,7 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) - little-plugger (1.1.4) locale (2.1.2) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) lograge (0.10.0) actionpack (>= 4) activesupport (>= 4) @@ -493,7 +457,6 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) - mousetrap-rails (1.4.6) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -575,9 +538,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (0.9.6) + os (1.0.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) @@ -605,7 +568,6 @@ GEM pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) - posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.10.4) addressable @@ -629,6 +591,10 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.3) + puma (3.12.0) + puma_worker_killer (0.1.0) + get_process_mem (~> 0.2) + puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) rack (1.6.11) rack-accept (0.4.5) @@ -797,7 +763,7 @@ GEM rubyzip (1.2.2) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.27.4) + rugged (0.27.5) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -843,7 +809,7 @@ GEM sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - signet (0.8.1) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -876,7 +842,6 @@ GEM state_machines-activerecord (0.5.1) activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) - stringex (2.8.4) sys-filesystem (1.1.6) ffi sysexits (1.2.0) @@ -968,7 +933,6 @@ DEPENDENCIES asana (~> 0.6.0) asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) - asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) @@ -1006,6 +970,7 @@ DEPENDENCIES ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) + escape_utils (~> 1.1) factory_bot_rails (~> 4.8.2) faraday (~> 0.12) fast_blank @@ -1013,6 +978,7 @@ DEPENDENCIES flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) + flowdock (~> 0.7) fog-aliyun (~> 0.2.0) fog-aws (~> 2.0.1) fog-core (~> 1.44) @@ -1027,18 +993,15 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.118.1) - github-linguist (~> 5.3.3) + gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-gollum-lib (~> 4.2) 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) + google-protobuf (~> 3.6) gpgme grape (~> 1.1) grape-entity (~> 0.7.1) @@ -1046,7 +1009,7 @@ DEPENDENCIES grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) - grpc (~> 1.11.0) + grpc (~> 1.15.0) haml_lint (~> 0.26.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) @@ -1075,7 +1038,6 @@ DEPENDENCIES method_source (~> 0.8) mini_magick minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap net-ssh (~> 5.0) @@ -1109,6 +1071,8 @@ DEPENDENCIES prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) + puma (~> 3.12) + puma_worker_killer rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) @@ -1187,4 +1151,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.4 + 1.17.1 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index dfbd535aaa8..64fbac6d437 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -164,15 +164,6 @@ }; version = "0.0.8"; }; - asset_sync = { - dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf"; - type = "gem"; - }; - version = "2.4.0"; - }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -1066,22 +1057,13 @@ version = "1.3.0"; }; gitaly-proto = { - dependencies = ["google-protobuf" "grpc"]; + dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; + sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg"; type = "gem"; }; - version = "0.118.1"; - }; - github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; - type = "gem"; - }; - version = "5.3.3"; + version = "0.123.0"; }; github-markup = { source = { @@ -1091,33 +1073,6 @@ }; version = "1.7.0"; }; - gitlab-flowdock-git-hook = { - dependencies = ["flowdock" "gitlab-grit" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8"; - type = "gem"; - }; - version = "1.0.1"; - }; - gitlab-gollum-lib = { - dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; - type = "gem"; - }; - version = "4.2.7.5"; - }; - gitlab-grit = { - dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; - type = "gem"; - }; - version = "2.8.2"; - }; gitlab-markup = { source = { remotes = ["https://rubygems.org"]; @@ -1162,15 +1117,6 @@ }; version = "0.4.1"; }; - gollum-grit_adapter = { - dependencies = ["gitlab-grit"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; - type = "gem"; - }; - version = "1.0.1"; - }; gon = { dependencies = ["actionpack" "multi_json" "request_store"]; source = { @@ -1192,28 +1138,28 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; + sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; + sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; googleauth = { - dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; + sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.6"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1278,13 +1224,13 @@ version = "1.8.1"; }; grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz"; + sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb"; type = "gem"; }; - version = "1.11.0"; + version = "1.15.0"; }; haml = { dependencies = ["temple" "tilt"]; @@ -1649,14 +1595,6 @@ }; version = "8.9.2"; }; - little-plugger = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; locale = { source = { remotes = ["https://rubygems.org"]; @@ -1665,15 +1603,6 @@ }; version = "2.1.2"; }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; source = { @@ -1791,14 +1720,6 @@ }; version = "5.7.0"; }; - mousetrap-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m"; - type = "gem"; - }; - version = "1.4.6"; - }; msgpack = { source = { remotes = ["https://rubygems.org"]; @@ -2114,10 +2035,10 @@ os = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; type = "gem"; }; - version = "0.9.6"; + version = "1.0.0"; }; parallel = { source = { @@ -2131,10 +2052,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; + sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; type = "gem"; }; - version = "2.5.1.0"; + version = "2.5.3.0"; }; parslet = { source = { @@ -2215,14 +2136,6 @@ }; version = "1.0.1"; }; - posix-spawn = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; - type = "gem"; - }; - version = "0.3.13"; - }; powerpack = { source = { remotes = ["https://rubygems.org"]; @@ -2309,6 +2222,23 @@ }; version = "3.0.3"; }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + type = "gem"; + }; + version = "3.12.0"; + }; + puma_worker_killer = { + dependencies = ["get_process_mem" "puma"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i"; + type = "gem"; + }; + version = "0.1.0"; + }; pyu-ruby-sasl = { source = { remotes = ["https://rubygems.org"]; @@ -2916,10 +2846,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72"; + sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; type = "gem"; }; - version = "0.27.4"; + version = "0.27.5"; }; safe_yaml = { source = { @@ -3075,10 +3005,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; type = "gem"; }; - version = "0.8.1"; + version = "0.11.0"; }; simple_po_parser = { source = { @@ -3199,14 +3129,6 @@ }; version = "0.5.1"; }; - stringex = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; - type = "gem"; - }; - version = "2.8.4"; - }; sys-filesystem = { dependencies = ["ffi"]; source = { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index ef14aace277..fc31db6278d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -82,13 +82,6 @@ gem 'gpgme' gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' -# Git Wiki -# Only used to compute wiki page slugs -gem 'gitlab-gollum-lib', '~> 4.2', require: false - -# Language detection -gem 'github-linguist', '~> 5.3.3', require: 'linguist' - # API gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' @@ -156,6 +149,7 @@ gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' gem 'nokogiri', '~> 1.8.2' +gem 'escape_utils', '~> 1.1' # Calendar rendering gem 'icalendar' @@ -169,6 +163,11 @@ group :unicorn do gem 'unicorn-worker-killer', '~> 0.4.4' end +group :puma do + gem 'puma', '~> 3.12', require: false + gem 'puma_worker_killer', require: false +end + # State machine gem 'state_machines-activerecord', '~> 0.5.1' @@ -222,7 +221,7 @@ gem 'hipchat', '~> 1.5.0' gem 'jira-ruby', '~> 1.4' # Flowdock integration -gem 'gitlab-flowdock-git-hook', '~> 1.0.1' +gem 'flowdock', '~> 0.7' # Slack integration gem 'slack-notifier', '~> 1.5.1' @@ -255,9 +254,6 @@ gem 'rack-attack', '~> 4.4.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -# Keyboard shortcuts -gem 'mousetrap-rails', '~> 1.4.6' - # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' @@ -435,11 +431,10 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' -gem 'grpc', '~> 1.11.0' +gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly' +gem 'grpc', '~> 1.15.0' -# Locked until https://github.com/google/protobuf/issues/4210 is closed -gem 'google-protobuf', '= 3.5.1' +gem 'google-protobuf', '~> 3.6' gem 'toml-rb', '~> 1.0.0', require: false @@ -451,6 +446,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' - -# Asset synchronization -gem 'asset_sync', '~> 2.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 28018c6c5c2..7c52bc32632 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -58,11 +58,6 @@ GEM asciidoctor (1.5.6.2) asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) - asset_sync (2.4.0) - activemodel (>= 4.1.0) - fog-core - mime-types (>= 2.99) - unf ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -298,32 +293,9 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.118.1) - google-protobuf (~> 3.1) - grpc (~> 1.10) - github-linguist (5.3.3) - charlock_holmes (~> 0.7.5) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.25.1) + gitaly-proto (0.123.0) + grpc (~> 1.0) github-markup (1.7.0) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-gollum-lib (4.2.7.5) - gemojione (~> 3.2) - github-markup (~> 1.6) - gollum-grit_adapter (~> 1.0) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 4.6.4) - stringex (~> 2.6) - gitlab-grit (2.8.2) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16) - posix-spawn (~> 0.3) gitlab-license (1.0.0) gitlab-markup (1.6.4) gitlab-sidekiq-fetcher (0.3.0) @@ -339,8 +311,6 @@ GEM rubyntlm (~> 0.5) globalid (0.4.1) activesupport (>= 4.2.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) gon (6.2.0) actionpack (>= 3.0) multi_json @@ -352,16 +322,15 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.5.1) - googleapis-common-protos-types (1.0.1) + google-protobuf (3.6.1) + googleapis-common-protos-types (1.0.2) google-protobuf (~> 3.0) - googleauth (0.6.2) + googleauth (0.6.6) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) @@ -385,10 +354,9 @@ GEM railties sprockets-rails graphql (1.8.1) - grpc (1.11.0) + grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) - googleauth (>= 0.5.1, < 0.7) gssapi (1.2.0) ffi (>= 1.0.1) haml (5.0.4) @@ -493,11 +461,7 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) - little-plugger (1.1.4) locale (2.1.2) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) lograge (0.10.0) actionpack (>= 4) activesupport (>= 4) @@ -521,7 +485,6 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) - mousetrap-rails (1.4.6) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -604,9 +567,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (0.9.6) + os (1.0.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) @@ -634,7 +597,6 @@ GEM pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) - posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.10.4) addressable @@ -658,6 +620,10 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.3) + puma (3.12.0) + puma_worker_killer (0.1.0) + get_process_mem (~> 0.2) + puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) rack (1.6.11) rack-accept (0.4.5) @@ -826,7 +792,7 @@ GEM rubyzip (1.2.2) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.27.4) + rugged (0.27.5) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -872,7 +838,7 @@ GEM sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - signet (0.8.1) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -905,7 +871,6 @@ GEM state_machines-activerecord (0.5.1) activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) - stringex (2.8.4) sys-filesystem (1.1.6) ffi sysexits (1.2.0) @@ -997,7 +962,6 @@ DEPENDENCIES asana (~> 0.6.0) asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) - asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) awesome_print aws-sdk @@ -1039,6 +1003,7 @@ DEPENDENCIES elasticsearch-rails (~> 0.1.9) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) + escape_utils (~> 1.1) factory_bot_rails (~> 4.8.2) faraday (~> 0.12) faraday_middleware-aws-signers-v4 @@ -1047,6 +1012,7 @@ DEPENDENCIES flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) + flowdock (~> 0.7) fog-aliyun (~> 0.2.0) fog-aws (~> 2.0.1) fog-core (~> 1.44) @@ -1061,11 +1027,8 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.118.1) - github-linguist (~> 5.3.3) + gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-gollum-lib (~> 4.2) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) gitlab-sidekiq-fetcher @@ -1073,7 +1036,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (= 3.5.1) + google-protobuf (~> 3.6) gpgme grape (~> 1.1) grape-entity (~> 0.7.1) @@ -1081,7 +1044,7 @@ DEPENDENCIES grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) - grpc (~> 1.11.0) + grpc (~> 1.15.0) gssapi haml_lint (~> 0.26.0) hamlit (~> 2.8.8) @@ -1111,7 +1074,6 @@ DEPENDENCIES method_source (~> 0.8) mini_magick minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap net-ntp @@ -1146,6 +1108,8 @@ DEPENDENCIES prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) + puma (~> 3.12) + puma_worker_killer rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) @@ -1224,4 +1188,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.4 + 1.17.1 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 32fc41235f4..a15dae06fc0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -164,15 +164,6 @@ }; version = "0.0.8"; }; - asset_sync = { - dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf"; - type = "gem"; - }; - version = "2.4.0"; - }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -1154,22 +1145,13 @@ version = "1.3.0"; }; gitaly-proto = { - dependencies = ["google-protobuf" "grpc"]; + dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; + sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg"; type = "gem"; }; - version = "0.118.1"; - }; - github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; - type = "gem"; - }; - version = "5.3.3"; + version = "0.123.0"; }; github-markup = { source = { @@ -1179,33 +1161,6 @@ }; version = "1.7.0"; }; - gitlab-flowdock-git-hook = { - dependencies = ["flowdock" "gitlab-grit" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8"; - type = "gem"; - }; - version = "1.0.1"; - }; - gitlab-gollum-lib = { - dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; - type = "gem"; - }; - version = "4.2.7.5"; - }; - gitlab-grit = { - dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; - type = "gem"; - }; - version = "2.8.2"; - }; gitlab-license = { source = { remotes = ["https://rubygems.org"]; @@ -1258,15 +1213,6 @@ }; version = "0.4.1"; }; - gollum-grit_adapter = { - dependencies = ["gitlab-grit"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; - type = "gem"; - }; - version = "1.0.1"; - }; gon = { dependencies = ["actionpack" "multi_json" "request_store"]; source = { @@ -1288,28 +1234,28 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; + sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; + sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; googleauth = { - dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; + sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.6"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1374,13 +1320,13 @@ version = "1.8.1"; }; grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz"; + sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb"; type = "gem"; }; - version = "1.11.0"; + version = "1.15.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1762,14 +1708,6 @@ }; version = "8.9.2"; }; - little-plugger = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; locale = { source = { remotes = ["https://rubygems.org"]; @@ -1778,15 +1716,6 @@ }; version = "2.1.2"; }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; source = { @@ -1904,14 +1833,6 @@ }; version = "5.7.0"; }; - mousetrap-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m"; - type = "gem"; - }; - version = "1.4.6"; - }; msgpack = { source = { remotes = ["https://rubygems.org"]; @@ -2235,10 +2156,10 @@ os = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; type = "gem"; }; - version = "0.9.6"; + version = "1.0.0"; }; parallel = { source = { @@ -2252,10 +2173,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; + sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; type = "gem"; }; - version = "2.5.1.0"; + version = "2.5.3.0"; }; parslet = { source = { @@ -2336,14 +2257,6 @@ }; version = "1.0.1"; }; - posix-spawn = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; - type = "gem"; - }; - version = "0.3.13"; - }; powerpack = { source = { remotes = ["https://rubygems.org"]; @@ -2430,6 +2343,23 @@ }; version = "3.0.3"; }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + type = "gem"; + }; + version = "3.12.0"; + }; + puma_worker_killer = { + dependencies = ["get_process_mem" "puma"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i"; + type = "gem"; + }; + version = "0.1.0"; + }; pyu-ruby-sasl = { source = { remotes = ["https://rubygems.org"]; @@ -3037,10 +2967,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72"; + sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; type = "gem"; }; - version = "0.27.4"; + version = "0.27.5"; }; safe_yaml = { source = { @@ -3196,10 +3126,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; type = "gem"; }; - version = "0.8.1"; + version = "0.11.0"; }; simple_po_parser = { source = { @@ -3320,14 +3250,6 @@ }; version = "0.5.1"; }; - stringex = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; - type = "gem"; - }; - version = "2.8.4"; - }; sys-filesystem = { dependencies = ["ffi"]; source = {