diff options
| author | Florian Klink <flokli@flokli.de> | 2019-04-22 23:41:01 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-04-23 09:47:47 +0200 |
| commit | aaa5ecf5a3449075966f7a74dd4b997486f66ea9 (patch) | |
| tree | 20454078051b4cffd499469f7565073d70baa40a | |
| parent | gitlab-workhorse: 8.3.1 -> 8.3.3 (diff) | |
| download | nixpkgs-aaa5ecf5a3449075966f7a74dd4b997486f66ea9.tar.gz | |
gitlab-ee: 11.9.1 -> 11.9.8
(cherry picked from commit 33423e52c6b24fb244751f47fba44690777f1c4a)
4 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e15709191bfd..b37a142318e7 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -15,18 +15,18 @@ } }, "ee": { - "version": "11.9.1", - "repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd", - "deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb", + "version": "11.9.8", + "repo_hash": "0h6lpaiwsvyn5cdga08zbgr6cwp3k6xi5jpb7n37hc6y4c7b36ry", + "deb_hash": "1bsy8qrr2sjvavzv4nslx14x4cx5xjx55d2v7zz6fvjzmgb98hgv", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.8-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.9.1-ee", + "rev": "v11.9.8-ee", "passthru": { "GITALY_SERVER_VERSION": "1.27.1", "GITLAB_PAGES_VERSION": "1.5.0", "GITLAB_SHELL_VERSION": "8.7.1", - "GITLAB_WORKHORSE_VERSION": "8.3.1" + "GITLAB_WORKHORSE_VERSION": "8.3.3" } } }
\ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 2847bd3e6c27..b2e42dc696c6 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -214,6 +214,9 @@ gem 'connection_pool', '~> 2.0' # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false +# HipChat integration +gem 'hipchat', '~> 1.5.0' + # JIRA integration gem 'jira-ruby', '~> 1.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 251d759be059..4cd35f7555df 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -391,6 +391,9 @@ GEM hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) + hipchat (1.5.2) + httparty + mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -1078,6 +1081,7 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) + hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index c62c26b2bd10..7fcada47777f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -1459,6 +1459,17 @@ }; version = "2.6.0"; }; + hipchat = { + dependencies = ["httparty" "mimemagic"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; + type = "gem"; + }; + version = "1.5.2"; + }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { |