Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: accbbc51a7ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 571b40d3f504
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Apr 23, 2019

  1. gitlab-workhorse: 8.3.1 -> 8.3.3 

    (cherry picked from commit 74eb807)
    @flokli
    flokli committed Apr 23, 2019
    Copy the full SHA
    ee048f2 View commit details

  2. gitlab-ee: 11.9.1 -> 11.9.8 

    (cherry picked from commit 33423e5)
    @flokli
    flokli committed Apr 23, 2019
    Copy the full SHA
    aaa5ecf View commit details

  3. gitlab-ce: 11.9.1 -> 11.9.8 

    (cherry picked from commit 04b5eb1)
    @flokli
    flokli committed Apr 23, 2019
    Copy the full SHA
    c6d78ac View commit details

  4. Merge pull request #60074 from flokli/18.09/gitlab-11.9.8 

    [18.09] gitlab: 11.9.1 -> 11.9.8
    @flokli
    flokli authored Apr 23, 2019
    Copy the full SHA
    571b40d View commit details
24 changes: 12 additions & 12 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"ce": {
"version": "11.9.1",
"repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l",
"deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb",
"version": "11.9.8",
"repo_hash": "10xlabp7ziw1vpyy9dvhaiwf5l340d3yzvlh2aq6ly3xlqr5ip07",
"deb_hash": "0apw0w5grhpfxwl76w7as5xb6injr7ka8wwk2azllamrxrnn30dv",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.8-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
"rev": "v11.9.1",
"rev": "v11.9.8",
"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"
}
},
"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"
}
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}";

version = "8.3.1";
version = "8.3.3";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j";
sha256 = "08v5ga9qbrs1xciw4cjhsjpqcp6cxzymc2y39la2a4lgb2cgyi10";
};

buildInputs = [ git go ];
3 changes: 3 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -204,6 +204,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'

4 changes: 4 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -364,6 +364,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)
@@ -1041,6 +1044,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)
11 changes: 11 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -1354,6 +1354,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 = {
3 changes: 3 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -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'

4 changes: 4 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -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)
11 changes: 11 additions & 0 deletions pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {