Skip to content

Commit

Permalink
Merge pull request #31208 from afrepues/gitlab-10.1.1
Browse files Browse the repository at this point in the history 
gitlab: 10.0.2 -> 10.1.1
  • Loading branch information
@NeQuissimus
NeQuissimus committed Nov 7, 2017
2 parents 648205e + f2ac5e0 commit 4db6d35
Show file tree
Hide file tree
Showing 14 changed files with 324 additions and 145 deletions.
4 changes: 4 additions & 0 deletions pkgs/applications/version-management/gitaly/Gemfile
View file
Expand Up @@ -3,3 +3,7 @@ source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
gem 'activesupport'

group :development, :test do
gem 'gitlab-styles', '~> 2.0.0', require: false
end
26 changes: 26 additions & 0 deletions pkgs/applications/version-management/gitaly/Gemfile.lock
View file
Expand Up @@ -8,6 +8,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
escape_utils (1.1.1)
Expand All @@ -21,6 +22,10 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
gitlab-styles (2.0.0)
rubocop (~> 0.49)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15)
google-protobuf (3.4.0.2)
googleauth (0.5.3)
faraday (~> 0.12)
Expand All @@ -47,7 +52,26 @@ GEM
multi_json (1.12.1)
multipart-post (2.0.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
powerpack (0.1.1)
public_suffix (2.0.5)
rainbow (2.2.2)
rake
rake (12.1.0)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.0)
rubocop (>= 0.47.1)
rubocop-rspec (1.17.0)
rubocop (>= 0.50.0)
ruby-progressbar (1.8.3)
rugged (0.26.0)
signet (0.7.3)
addressable (~> 2.3)
Expand All @@ -57,6 +81,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)

PLATFORMS
ruby
Expand All @@ -65,6 +90,7 @@ DEPENDENCIES
activesupport
gitaly-proto (~> 0.37.0)
github-linguist (~> 4.7.0)
gitlab-styles (~> 2.0.0)

BUNDLED WITH
1.15.4
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitaly/default.nix
View file
Expand Up @@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "0.38.0";
version = "0.43.1";
name = "gitaly-${version}";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf";
sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
};

goPackagePath = "gitlab.com/gitlab-org/gitaly";
Expand Down
102 changes: 102 additions & 0 deletions pkgs/applications/version-management/gitaly/gemset.nix
View file
Expand Up @@ -17,6 +17,14 @@
};
version = "2.5.1";
};
ast = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
type = "gem";
};
version = "2.3.0";
};
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
Expand Down Expand Up @@ -68,6 +76,15 @@
};
version = "4.7.6";
};
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4";
type = "gem";
};
version = "2.0.0";
};
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
Expand Down Expand Up @@ -184,6 +201,31 @@
};
version = "0.9.6";
};
parallel = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
type = "gem";
};
version = "1.12.0";
};
parser = {
dependencies = ["ast"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
type = "gem";
};
version = "2.4.0.0";
};
powerpack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
type = "gem";
};
version = "0.1.1";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
Expand All @@ -192,6 +234,58 @@
};
version = "2.0.5";
};
rainbow = {
dependencies = ["rake"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
type = "gem";
};
version = "2.2.2";
};
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
type = "gem";
};
version = "12.1.0";
};
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz";
type = "gem";
};
version = "0.50.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
type = "gem";
};
version = "0.1.0";
};
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs";
type = "gem";
};
version = "1.17.0";
};
ruby-progressbar = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf";
type = "gem";
};
version = "1.8.3";
};
rugged = {
source = {
remotes = ["https://rubygems.org"];
Expand Down Expand Up @@ -226,4 +320,12 @@
};
version = "1.2.2";
};
unicode-display_width = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
type = "gem";
};
version = "1.3.0";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-shell/default.nix
View file
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:

stdenv.mkDerivation rec {
version = "5.9.0";
version = "5.9.3";
name = "gitlab-shell-${version}";

srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf";
sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
View file
Expand Up @@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
require_relative 'gitlab_reference_counter'
require_relative 'gitlab_metrics'

class GitlabProjects
- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
Expand All @@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index e7d0254..181ec8a 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -163,7 +163,8 @@ class GitlabShell
@@ -188,7 +188,8 @@ class GitlabShell
end

# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-workhorse/default.nix
View file
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:

stdenv.mkDerivation rec {
version = "3.0.0";
version = "3.2.0";
name = "gitlab-workhorse-${version}";

srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j";
sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
};

buildInputs = [ git go ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
View file
Expand Up @@ -2,11 +2,11 @@ diff --git a/internal/git/command.go b/internal/git/command.go
index 0e5496c..5778294 100644
--- a/internal/git/command.go
+++ b/internal/git/command.go
@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
cmd.Env = []string{
fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
fmt.Sprintf("GL_ID=%s", gl_id),
fmt.Sprintf("GL_PROTOCOL=http"),
}
17 changes: 9 additions & 8 deletions pkgs/applications/version-management/gitlab/Gemfile
View file
Expand Up @@ -23,10 +23,10 @@ gem 'faraday', '~> 0.12'
# Authentication libraries
gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.1.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
Expand Down Expand Up @@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.1.0'

# for Google storage
gem 'google-api-client', '~> 0.8.6'
gem 'google-api-client', '~> 0.13.6'

# for aws storage
gem 'unf', '~> 0.1.4'
Expand All @@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.5.1'
gem 'gitlab-markup', '~> 1.6.2'
gem 'redcarpet', '~> 3.4'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2'
Expand Down Expand Up @@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '~> 2.7.2'

gem 'addressable', '~> 2.3.8'
gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
Expand Down Expand Up @@ -281,7 +281,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false

# Prometheus
gem 'prometheus-client-mmap', '~>0.7.0.beta14'
gem 'prometheus-client-mmap', '~>0.7.0.beta18'
gem 'raindrops', '~> 0.18'
end

Expand Down Expand Up @@ -356,12 +356,13 @@ end
group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.6.2'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'test_after_commit', '~> 1.1'
gem 'sham_rack', '~> 1.3.6'
gem 'timecop', '~> 0.8.0'
gem 'concurrent-ruby', '~> 1.0.5'
gem 'test-prof', '~> 0.2.5'
end

gem 'octokit', '~> 4.6.2'
Expand Down Expand Up @@ -397,7 +398,7 @@ group :ed25519 do
end

# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'

gem 'toml-rb', '~> 0.3.15', require: false

Expand Down

0 comments on commit 4db6d35

Please sign in to comment.