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: 476760bfeb4d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d402472b5442
Choose a head ref
  • 3 commits
  • 14 files changed
  • 2 contributors

Commits on Mar 25, 2019

  1. gitlab: 11.7.5 -> 11.8.2

    @bgamari
    bgamari committed Mar 25, 2019
    Copy the full SHA
    0ba98bb View commit details

  2. gitlab: 11.8.2 -> 11.9.0

    @bgamari
    bgamari committed Mar 25, 2019
    Copy the full SHA
    d8c16f1 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #57774 from bgamari/update-gitlab 

    gitlab: Update to 11.9.0
    @flokli
    flokli authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d402472 View commit details
36 changes: 18 additions & 18 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.7.5",
"repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn",
"deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb",
"version": "11.9.0",
"repo_hash": "1dm7syarifhfzy63mnwipmk01h9yxrbzqxlkjzqff4nrx04301lr",
"deb_hash": "0p97ykl8vz47d9y0rgn738p79i4sx64dgj5f2x8r2ylz7ihzzp0k",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.0-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
"rev": "v11.7.5",
"rev": "v11.9.0",
"passthru": {
"GITALY_SERVER_VERSION": "1.12.2",
"GITLAB_PAGES_VERSION": "1.3.1",
"GITLAB_SHELL_VERSION": "8.4.4",
"GITLAB_WORKHORSE_VERSION": "8.0.2"
"GITALY_SERVER_VERSION": "1.27.0",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
}
},
"ee": {
"version": "11.7.5",
"repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm",
"deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb",
"version": "11.9.0",
"repo_hash": "0p4b65b6yqw5xhhz11ww9pn03dm4qws7qhk840r3cgsv23n1jcqv",
"deb_hash": "08k1l0k2n7jrm75l8x4fnb7jwwzzxp31ywriyj7y3pwin9xsmkmc",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.0-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
"rev": "v11.7.5-ee",
"rev": "v11.9.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.12.2",
"GITLAB_PAGES_VERSION": "1.3.1",
"GITLAB_SHELL_VERSION": "8.4.4",
"GITLAB_WORKHORSE_VERSION": "8.0.2"
"GITALY_SERVER_VERSION": "1.27.0",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
}
}
}
12 changes: 10 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -3,17 +3,18 @@ source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
gem 'bundler', '>= 1.16.5'

gem 'rugged', '~> 0.27'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.5'
gem 'gitaly-proto', '~> 1.3.0'
gem 'gitaly-proto', '~> 1.13.0'
gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
gem 'gitlab-gollum-lib', '~> 4.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
gem 'grpc', '~> 1.15.0'
gem 'sentry-raven', '~> 2.7.2', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false

# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -27,4 +28,11 @@ group :development, :test do
gem 'rspec-parameterized', require: false
gem 'timecop', require: false
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false

# gitlab-shell spec gems
gem 'listen', '~> 0.5.0'
gem 'simplecov', '~> 0.9.0', require: false
gem 'vcr', '~> 4.0.0'
gem 'webmock', '~> 3.4.0'
end
57 changes: 47 additions & 10 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
@@ -19,18 +21,22 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.1.5)
equalizer (0.0.11)
escape_utils (1.2.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
ffi (1.10.0)
gemojione (3.3.0)
json
gitaly-proto (1.3.0)
gitaly-proto (1.13.0)
grpc (~> 1.0)
github-linguist (6.2.0)
charlock_holmes (~> 0.7.6)
@@ -58,29 +64,35 @@ GEM
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
google-protobuf (3.6.1)
googleapis-common-protos-types (1.0.2)
googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
grpc (1.15.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
hashdiff (0.3.8)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.1.0)
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.2.6)
multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
optimist (3.0.0)
parallel (1.12.1)
parser (2.5.3.0)
ast (~> 2.4.0)
@@ -91,7 +103,15 @@ GEM
parser
unparser
procto (0.0.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rainbow (3.0.0)
rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (4.3.0)
rouge (3.3.0)
rspec (3.7.0)
@@ -121,13 +141,19 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rugged (0.27.5)
rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sentry-raven (2.7.2)
sentry-raven (2.7.4)
faraday (>= 0.7.6, < 1.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
stringex (2.8.4)
thread_safe (0.3.6)
timecop (0.9.1)
@@ -142,6 +168,11 @@ GEM
equalizer (~> 0.0.9)
parser (>= 2.3.1.2, < 2.6)
procto (~> 0.0.2)
vcr (4.0.0)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff

PLATFORMS
ruby
@@ -151,21 +182,27 @@ DEPENDENCIES
bundler (>= 1.16.5)
factory_bot
faraday (~> 0.12)
gitaly-proto (~> 1.3.0)
gitaly-proto (~> 1.13.0)
github-linguist (~> 6.1)
gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-markup (~> 1.6.5)
google-protobuf (~> 3.6)
grpc (~> 1.15.0)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
rdoc (~> 4.2)
rspec
rspec-parameterized
rubocop (~> 0.50)
rugged (~> 0.27)
rugged (~> 0.28)
sentry-raven (~> 2.7.2)
simplecov (~> 0.9.0)
timecop
vcr (~> 4.0.0)
webmock (~> 3.4.0)

BUNDLED WITH
1.17.1
1.17.3
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "1.12.2";
version = "1.27.0";
name = "gitaly-${version}";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy";
sha256 = "0m96048nxbgdkly5rz9d21yz8dmgv1kqis98is5kdz5b1wmhz18r";
};

goPackagePath = "gitlab.com/gitlab-org/gitaly";
Loading