Merge pull request #60886 from flokli/gitlab-11.10.4
gitlab-{ce,ee}: 11.9.11 -> 11.10.4
This commit is contained in:
Robin Gloster
GitHub
commit
2a53f75c7d
14 changed files with 327 additions and 261 deletions
|
|
@ -1,32 +1,32 @@
|
|||
{
|
||||
"ce": {
|
||||
"version": "11.9.11",
|
||||
"repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6",
|
||||
"deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm",
|
||||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb",
|
||||
"version": "11.10.4",
|
||||
"repo_hash": "02rvf5ikahydswjldzg99k8han051ap7v8h9mcjgrr4xmj301hxm",
|
||||
"deb_hash": "0sigpp5lhg4pl88gsgf7dq2k7mi2wgaz0vdsl25c97w1daw7a60c",
|
||||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.4-ce.0_amd64.deb/download.deb",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab-ce",
|
||||
"rev": "v11.9.11",
|
||||
"rev": "v11.10.4",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "1.27.2",
|
||||
"GITALY_SERVER_VERSION": "1.34.1",
|
||||
"GITLAB_PAGES_VERSION": "1.5.0",
|
||||
"GITLAB_SHELL_VERSION": "8.7.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.3.3"
|
||||
"GITLAB_SHELL_VERSION": "9.0.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.5.2"
|
||||
}
|
||||
},
|
||||
"ee": {
|
||||
"version": "11.9.11",
|
||||
"repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph",
|
||||
"deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0",
|
||||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb",
|
||||
"version": "11.10.4",
|
||||
"repo_hash": "06nf94k0ay9kmx060j387hydyf6crv0f1pjb691r3y6s713m6php",
|
||||
"deb_hash": "1g0mlyzm2ikpblmy529wg6az5biiqczpr3kyp2mk4yjkdvg59jjp",
|
||||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.4-ee.0_amd64.deb/download.deb",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab-ee",
|
||||
"rev": "v11.9.11-ee",
|
||||
"rev": "v11.10.4-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "1.27.2",
|
||||
"GITALY_SERVER_VERSION": "1.34.1",
|
||||
"GITLAB_PAGES_VERSION": "1.5.0",
|
||||
"GITLAB_SHELL_VERSION": "8.7.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.3.3"
|
||||
"GITLAB_SHELL_VERSION": "9.0.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.5.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,14 +5,14 @@ gem 'bundler', '>= 1.16.5'
|
|||
|
||||
gem 'rugged', '~> 0.28'
|
||||
gem 'github-linguist', '~> 6.1', require: 'linguist'
|
||||
gem 'gitlab-markup', '~> 1.6.5'
|
||||
gem 'gitaly-proto', '~> 1.13.0'
|
||||
gem 'gitlab-markup', '~> 1.7.0'
|
||||
gem 'gitaly-proto', '~> 1.22.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 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
|
||||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
|
||||
gem 'grpc', '~> 1.15.0'
|
||||
gem 'sentry-raven', '~> 2.7.2', require: false
|
||||
gem 'sentry-raven', '~> 2.9.0', require: false
|
||||
gem 'faraday', '~> 0.12'
|
||||
gem 'rbtrace', require: false
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
activesupport (5.0.7)
|
||||
activesupport (5.0.7.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -36,15 +36,15 @@ GEM
|
|||
ffi (1.10.0)
|
||||
gemojione (3.3.0)
|
||||
json
|
||||
gitaly-proto (1.13.0)
|
||||
gitaly-proto (1.22.0)
|
||||
grpc (~> 1.0)
|
||||
github-linguist (6.2.0)
|
||||
github-linguist (6.4.1)
|
||||
charlock_holmes (~> 0.7.6)
|
||||
escape_utils (~> 1.2.0)
|
||||
mime-types (>= 1.19)
|
||||
rugged (>= 0.25.1)
|
||||
github-markup (1.7.0)
|
||||
gitlab-gollum-lib (4.2.7.5)
|
||||
gitlab-gollum-lib (4.2.7.7)
|
||||
gemojione (~> 3.2)
|
||||
github-markup (~> 1.6)
|
||||
gollum-grit_adapter (~> 1.0)
|
||||
|
|
@ -52,7 +52,7 @@ GEM
|
|||
rouge (~> 3.1)
|
||||
sanitize (~> 4.6.4)
|
||||
stringex (~> 2.6)
|
||||
gitlab-gollum-rugged_adapter (0.4.4.1)
|
||||
gitlab-gollum-rugged_adapter (0.4.4.2)
|
||||
mime-types (>= 1.15)
|
||||
rugged (~> 0.25)
|
||||
gitlab-grit (2.8.2)
|
||||
|
|
@ -60,20 +60,20 @@ GEM
|
|||
diff-lcs (~> 1.1)
|
||||
mime-types (>= 1.16)
|
||||
posix-spawn (~> 0.3)
|
||||
gitlab-markup (1.6.5)
|
||||
gitlab-markup (1.7.0)
|
||||
gollum-grit_adapter (1.0.1)
|
||||
gitlab-grit (~> 2.7, >= 2.7.1)
|
||||
google-protobuf (3.6.1)
|
||||
googleapis-common-protos-types (1.0.3)
|
||||
google-protobuf (3.7.1)
|
||||
googleapis-common-protos-types (1.0.4)
|
||||
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)
|
||||
i18n (1.6.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
json (2.1.0)
|
||||
json (2.2.0)
|
||||
licensee (8.9.2)
|
||||
rugged (~> 0.24)
|
||||
listen (0.5.3)
|
||||
|
|
@ -88,7 +88,7 @@ GEM
|
|||
msgpack (1.2.6)
|
||||
multi_json (1.13.1)
|
||||
multipart-post (2.0.0)
|
||||
nokogiri (1.10.1)
|
||||
nokogiri (1.10.2)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (1.5.0)
|
||||
nokogiri
|
||||
|
|
@ -141,20 +141,20 @@ GEM
|
|||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-progressbar (1.10.0)
|
||||
rugged (0.28.0)
|
||||
rugged (0.28.1)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
nokogumbo (~> 1.4)
|
||||
sentry-raven (2.7.4)
|
||||
sentry-raven (2.9.0)
|
||||
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)
|
||||
stringex (2.8.5)
|
||||
thread_safe (0.3.6)
|
||||
timecop (0.9.1)
|
||||
tzinfo (1.2.5)
|
||||
|
|
@ -182,11 +182,11 @@ DEPENDENCIES
|
|||
bundler (>= 1.16.5)
|
||||
factory_bot
|
||||
faraday (~> 0.12)
|
||||
gitaly-proto (~> 1.13.0)
|
||||
gitaly-proto (~> 1.22.0)
|
||||
github-linguist (~> 6.1)
|
||||
gitlab-gollum-lib (~> 4.2)
|
||||
gitlab-gollum-rugged_adapter (~> 0.4.4)
|
||||
gitlab-markup (~> 1.6.5)
|
||||
gitlab-gollum-lib (~> 4.2.7.7)
|
||||
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
|
||||
gitlab-markup (~> 1.7.0)
|
||||
google-protobuf (~> 3.6)
|
||||
grpc (~> 1.15.0)
|
||||
licensee (~> 8.9.0)
|
||||
|
|
@ -198,7 +198,7 @@ DEPENDENCIES
|
|||
rspec-parameterized
|
||||
rubocop (~> 0.50)
|
||||
rugged (~> 0.28)
|
||||
sentry-raven (~> 2.7.2)
|
||||
sentry-raven (~> 2.9.0)
|
||||
simplecov (~> 0.9.0)
|
||||
timecop
|
||||
vcr (~> 4.0.0)
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
in buildGoPackage rec {
|
||||
version = "1.27.2";
|
||||
version = "1.34.1";
|
||||
name = "gitaly-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0";
|
||||
sha256 = "1nj1vw3qzfg5azx70ssbjicwqjxd6ka2fkk4rj5bby53755ywl7b";
|
||||
};
|
||||
|
||||
goPackagePath = "gitlab.com/gitlab-org/gitaly";
|
||||
|
|
@ -27,12 +27,12 @@ in buildGoPackage rec {
|
|||
|
||||
postInstall = ''
|
||||
mkdir -p $ruby
|
||||
cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby
|
||||
cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby
|
||||
|
||||
# gitlab-shell will try to read its config relative to the source
|
||||
# code by default which doesn't work in nixos because it's a
|
||||
# read-only filesystem
|
||||
substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \
|
||||
substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
|
||||
"File.join(ROOT_PATH, 'config.yml')" \
|
||||
"'/run/gitlab/shell-config.yml'"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -9,12 +9,14 @@
|
|||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5";
|
||||
sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.7";
|
||||
version = "5.0.7.2";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
|
|
@ -178,21 +180,25 @@
|
|||
};
|
||||
gitaly-proto = {
|
||||
dependencies = ["grpc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
|
||||
sha256 = "114q2qnd6196xvzmv3jia4n4j4wm3rizqbvxjd9156g0hc20q6yf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.0";
|
||||
version = "1.22.0";
|
||||
};
|
||||
github-linguist = {
|
||||
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y";
|
||||
sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.2.0";
|
||||
version = "6.4.1";
|
||||
};
|
||||
github-markup = {
|
||||
source = {
|
||||
|
|
@ -204,21 +210,25 @@
|
|||
};
|
||||
gitlab-gollum-lib = {
|
||||
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
|
||||
sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.7.5";
|
||||
version = "4.2.7.7";
|
||||
};
|
||||
gitlab-gollum-rugged_adapter = {
|
||||
dependencies = ["mime-types" "rugged"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
|
||||
sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.4.1";
|
||||
version = "0.4.4.2";
|
||||
};
|
||||
gitlab-grit = {
|
||||
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
|
||||
|
|
@ -230,12 +240,14 @@
|
|||
version = "2.8.2";
|
||||
};
|
||||
gitlab-markup = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
|
||||
sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.5";
|
||||
version = "1.7.0";
|
||||
};
|
||||
gollum-grit_adapter = {
|
||||
dependencies = ["gitlab-grit"];
|
||||
|
|
@ -247,21 +259,25 @@
|
|||
version = "1.0.1";
|
||||
};
|
||||
google-protobuf = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
|
||||
sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.6.1";
|
||||
version = "3.7.1";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
|
||||
sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
};
|
||||
grpc = {
|
||||
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
|
||||
|
|
@ -282,12 +298,14 @@
|
|||
};
|
||||
i18n = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7";
|
||||
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.6.0";
|
||||
};
|
||||
ice_nine = {
|
||||
source = {
|
||||
|
|
@ -298,12 +316,14 @@
|
|||
version = "0.11.2";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
|
||||
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
licensee = {
|
||||
dependencies = ["rugged"];
|
||||
|
|
@ -398,12 +418,14 @@
|
|||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
|
||||
sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
};
|
||||
nokogumbo = {
|
||||
dependencies = ["nokogiri"];
|
||||
|
|
@ -593,12 +615,14 @@
|
|||
version = "1.10.0";
|
||||
};
|
||||
rugged = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
|
||||
sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
};
|
||||
safe_yaml = {
|
||||
source = {
|
||||
|
|
@ -619,12 +643,14 @@
|
|||
};
|
||||
sentry-raven = {
|
||||
dependencies = ["faraday"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
|
||||
sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.4";
|
||||
version = "2.9.0";
|
||||
};
|
||||
simplecov = {
|
||||
dependencies = ["docile" "multi_json" "simplecov-html"];
|
||||
|
|
@ -644,12 +670,14 @@
|
|||
version = "0.9.0";
|
||||
};
|
||||
stringex = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
|
||||
sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
};
|
||||
thread_safe = {
|
||||
source = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.7.1";
|
||||
version = "9.0.0";
|
||||
name = "gitlab-shell-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia";
|
||||
sha256 = "0437pigcgd5qi9ars8br1l058h2mijyv02axlr8wdb1vjsss857g";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby bundler go ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "gitlab-workhorse-${version}";
|
||||
|
||||
version = "8.3.3";
|
||||
version = "8.5.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-workhorse";
|
||||
rev = "v${version}";
|
||||
sha256 = "08v5ga9qbrs1xciw4cjhsjpqcp6cxzymc2y39la2a4lgb2cgyi10";
|
||||
sha256 = "0c1wpp81wr4x00pmc2z41xh4vy7yk97fkcg0cdy7gbz2hc5cm296";
|
||||
};
|
||||
|
||||
buildInputs = [ git go ];
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
|
|||
gem 'omniauth-twitter', '~> 1.4'
|
||||
gem 'omniauth_crowd', '~> 2.2.0'
|
||||
gem 'omniauth-authentiq', '~> 0.3.3'
|
||||
gem 'rack-oauth2', '~> 1.2.1'
|
||||
gem 'rack-oauth2', '~> 1.9.3'
|
||||
gem 'jwt', '~> 2.1.0'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 2.0'
|
||||
|
||||
# Two-factor authentication
|
||||
|
|
@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.7'
|
|||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.8'
|
||||
gem 'deckar01-task_list', '2.2.0'
|
||||
gem 'gitlab-markup', '~> 1.6.5'
|
||||
gem 'gitlab-markup', '~> 1.7.0'
|
||||
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.17'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
|
|
@ -128,7 +128,7 @@ gem 'asciidoctor', '~> 1.5.8'
|
|||
gem 'asciidoctor-plantuml', '0.0.8'
|
||||
gem 'rouge', '~> 3.1'
|
||||
gem 'truncato', '~> 0.7.11'
|
||||
gem 'bootstrap_form', '~> 2.7.0'
|
||||
gem 'bootstrap_form', '~> 4.2.0'
|
||||
gem 'nokogiri', '~> 1.10.1'
|
||||
gem 'escape_utils', '~> 1.1'
|
||||
|
||||
|
|
@ -139,10 +139,7 @@ gem 'icalendar'
|
|||
gem 'diffy', '~> 3.1.0'
|
||||
|
||||
# Application server
|
||||
# The 2.0.6 version of rack requires monkeypatch to be present in
|
||||
# `config.ru`. This can be removed once a new update for Rack
|
||||
# is available that contains https://github.com/rack/rack/pull/1201.
|
||||
gem 'rack', '2.0.6'
|
||||
gem 'rack', '~> 2.0.7'
|
||||
|
||||
group :unicorn do
|
||||
gem 'unicorn', '~> 5.4.1'
|
||||
|
|
@ -158,7 +155,7 @@ end
|
|||
gem 'state_machines-activerecord', '~> 0.5.1'
|
||||
|
||||
# Issue tags
|
||||
gem 'acts-as-taggable-on', '~> 5.0'
|
||||
gem 'acts-as-taggable-on', '~> 6.0'
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', '~> 5.2.1'
|
||||
|
|
@ -170,7 +167,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
|
|||
gem 'fugit', '~> 1.1'
|
||||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.13.3'
|
||||
gem 'httparty', '~> 0.16.4'
|
||||
|
||||
# Colored output to console
|
||||
gem 'rainbow', '~> 3.0'
|
||||
|
|
@ -268,9 +265,7 @@ gem 'addressable', '~> 2.5.2'
|
|||
gem 'font-awesome-rails', '~> 4.7'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
gem 'gon', '~> 6.2'
|
||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
gem 'request_store', '~> 1.3'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
|
|
@ -424,7 +419,7 @@ group :ed25519 do
|
|||
end
|
||||
|
||||
# Gitaly GRPC client
|
||||
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
|
||||
gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
|
||||
|
||||
gem 'grpc', '~> 1.15.0'
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ GEM
|
|||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
acts-as-taggable-on (5.0.0)
|
||||
activerecord (>= 4.2.8)
|
||||
acts-as-taggable-on (6.0.0)
|
||||
activerecord (~> 5.0)
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
|
|
@ -65,7 +65,7 @@ GEM
|
|||
atomic (1.1.99)
|
||||
attr_encrypted (3.1.0)
|
||||
encryptor (~> 3.0.0)
|
||||
attr_required (1.0.0)
|
||||
attr_required (1.0.1)
|
||||
awesome_print (1.8.0)
|
||||
axiom-types (0.1.1)
|
||||
descendants_tracker (~> 0.0.4)
|
||||
|
|
@ -87,7 +87,9 @@ GEM
|
|||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.4.1)
|
||||
msgpack (~> 1.0)
|
||||
bootstrap_form (2.7.0)
|
||||
bootstrap_form (4.2.0)
|
||||
actionpack (>= 5.0)
|
||||
activemodel (>= 5.0)
|
||||
brakeman (4.2.1)
|
||||
browser (2.5.3)
|
||||
builder (3.2.3)
|
||||
|
|
@ -260,7 +262,7 @@ GEM
|
|||
foreman (0.84.0)
|
||||
thor (~> 0.19.1)
|
||||
formatador (0.2.5)
|
||||
fugit (1.1.7)
|
||||
fugit (1.1.9)
|
||||
et-orbi (~> 1.1, >= 1.1.7)
|
||||
raabro (~> 1.1)
|
||||
fuubar (2.2.0)
|
||||
|
|
@ -279,12 +281,12 @@ GEM
|
|||
gettext_i18n_rails (>= 0.7.1)
|
||||
po_to_json (>= 1.0.0)
|
||||
rails (>= 3.2.0)
|
||||
gitaly-proto (1.13.0)
|
||||
gitaly-proto (1.19.0)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab-default_value_for (3.1.1)
|
||||
activerecord (>= 3.2.0, < 6.0)
|
||||
gitlab-markup (1.6.5)
|
||||
gitlab-markup (1.7.0)
|
||||
gitlab-sidekiq-fetcher (0.4.0)
|
||||
sidekiq (~> 5)
|
||||
gitlab-styles (2.5.1)
|
||||
|
|
@ -382,8 +384,8 @@ GEM
|
|||
domain_name (~> 0.5)
|
||||
http-form_data (2.1.1)
|
||||
http_parser.rb (0.6.0)
|
||||
httparty (0.13.7)
|
||||
json (~> 1.8)
|
||||
httparty (0.16.4)
|
||||
mime-types (~> 3.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.6.0)
|
||||
|
|
@ -401,7 +403,6 @@ GEM
|
|||
activesupport
|
||||
multipart-post
|
||||
oauth (~> 0.5, >= 0.5.0)
|
||||
jquery-atwho-rails (1.3.2)
|
||||
js_regex (3.1.1)
|
||||
character_set (~> 1.1)
|
||||
regexp_parser (~> 1.1)
|
||||
|
|
@ -587,7 +588,7 @@ GEM
|
|||
atomic (>= 1.0.0)
|
||||
peek
|
||||
redis
|
||||
pg (1.1.3)
|
||||
pg (1.1.4)
|
||||
po_to_json (1.0.1)
|
||||
json (>= 1.6.0)
|
||||
powerpack (0.1.1)
|
||||
|
|
@ -619,18 +620,18 @@ GEM
|
|||
puma (>= 2.7, < 4)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.1.6)
|
||||
rack (2.0.6)
|
||||
rack (2.0.7)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (4.4.1)
|
||||
rack
|
||||
rack-cors (1.0.2)
|
||||
rack-oauth2 (1.2.3)
|
||||
activesupport (>= 2.3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.4)
|
||||
multi_json (>= 1.3.6)
|
||||
rack (>= 1.1)
|
||||
rack-oauth2 (1.9.3)
|
||||
activesupport
|
||||
attr_required
|
||||
httpclient
|
||||
json-jwt (>= 1.9.0)
|
||||
rack
|
||||
rack-protection (2.0.5)
|
||||
rack
|
||||
rack-proxy (0.6.0)
|
||||
|
|
@ -683,7 +684,7 @@ GEM
|
|||
optimist (>= 3.0.0)
|
||||
rdoc (6.0.4)
|
||||
re2 (1.1.1)
|
||||
recaptcha (3.0.0)
|
||||
recaptcha (4.13.1)
|
||||
json
|
||||
recursive-open-struct (1.1.0)
|
||||
redis (3.3.5)
|
||||
|
|
@ -788,7 +789,7 @@ GEM
|
|||
rubyntlm (0.6.2)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (1.2.2)
|
||||
rugged (0.28.0)
|
||||
rugged (0.28.1)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
|
|
@ -814,12 +815,10 @@ GEM
|
|||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
select2-rails (3.5.9.3)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (3.12.0)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.2)
|
||||
sentry-raven (2.7.4)
|
||||
sentry-raven (2.9.0)
|
||||
faraday (>= 0.7.6, < 1.0)
|
||||
settingslogic (2.0.9)
|
||||
sexp_processor (4.11.0)
|
||||
|
|
@ -954,7 +953,7 @@ DEPENDENCIES
|
|||
RedCloth (~> 4.3.2)
|
||||
ace-rails-ap (~> 4.1.0)
|
||||
activerecord_sane_schema_dumper (= 1.0)
|
||||
acts-as-taggable-on (~> 5.0)
|
||||
acts-as-taggable-on (~> 6.0)
|
||||
addressable (~> 2.5.2)
|
||||
akismet (~> 2.0)
|
||||
asana (~> 0.8.1)
|
||||
|
|
@ -970,7 +969,7 @@ DEPENDENCIES
|
|||
better_errors (~> 2.5.0)
|
||||
binding_of_caller (~> 0.8.0)
|
||||
bootsnap (~> 1.4)
|
||||
bootstrap_form (~> 2.7.0)
|
||||
bootstrap_form (~> 4.2.0)
|
||||
brakeman (~> 4.2)
|
||||
browser (~> 2.5)
|
||||
bullet (~> 5.5.0)
|
||||
|
|
@ -1021,10 +1020,10 @@ DEPENDENCIES
|
|||
gettext (~> 3.2.2)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly-proto (~> 1.13.0)
|
||||
gitaly-proto (~> 1.19.0)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-default_value_for (~> 3.1.1)
|
||||
gitlab-markup (~> 1.6.5)
|
||||
gitlab-markup (~> 1.7.0)
|
||||
gitlab-sidekiq-fetcher (~> 0.4.0)
|
||||
gitlab-styles (~> 2.4)
|
||||
gitlab_omniauth-ldap (~> 2.1.1)
|
||||
|
|
@ -1047,12 +1046,11 @@ DEPENDENCIES
|
|||
hipchat (~> 1.5.0)
|
||||
html-pipeline (~> 2.8)
|
||||
html2text
|
||||
httparty (~> 0.13.3)
|
||||
httparty (~> 0.16.4)
|
||||
icalendar
|
||||
influxdb (~> 0.2)
|
||||
jaeger-client (~> 0.10.0)
|
||||
jira-ruby (~> 1.4)
|
||||
jquery-atwho-rails (~> 1.3.2)
|
||||
js_regex (~> 3.1)
|
||||
json-schema (~> 2.8.0)
|
||||
jwt (~> 2.1.0)
|
||||
|
|
@ -1106,10 +1104,10 @@ DEPENDENCIES
|
|||
pry-rails (~> 0.3.4)
|
||||
puma (~> 3.12)
|
||||
puma_worker_killer
|
||||
rack (= 2.0.6)
|
||||
rack (~> 2.0.7)
|
||||
rack-attack (~> 4.4.1)
|
||||
rack-cors (~> 1.0.0)
|
||||
rack-oauth2 (~> 1.2.1)
|
||||
rack-oauth2 (~> 1.9.3)
|
||||
rack-proxy (~> 0.6.0)
|
||||
rails (= 5.0.7.2)
|
||||
rails-controller-testing
|
||||
|
|
@ -1121,7 +1119,7 @@ DEPENDENCIES
|
|||
rbtrace (~> 0.4)
|
||||
rdoc (~> 6.0)
|
||||
re2 (~> 1.1.1)
|
||||
recaptcha (~> 3.0)
|
||||
recaptcha (~> 4.11)
|
||||
redis (~> 3.2)
|
||||
redis-namespace (~> 1.6.0)
|
||||
redis-rails (~> 5.0.2)
|
||||
|
|
@ -1148,7 +1146,6 @@ DEPENDENCIES
|
|||
sass-rails (~> 5.0.6)
|
||||
scss_lint (~> 0.56.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
select2-rails (~> 3.5.9)
|
||||
selenium-webdriver (~> 3.12)
|
||||
sentry-raven (~> 2.7)
|
||||
settingslogic (~> 2.0.9)
|
||||
|
|
|
|||
|
|
@ -114,12 +114,14 @@
|
|||
};
|
||||
acts-as-taggable-on = {
|
||||
dependencies = ["activerecord"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
|
||||
sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "6.0.0";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
|
|
@ -215,12 +217,14 @@
|
|||
version = "3.1.0";
|
||||
};
|
||||
attr_required = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
|
||||
sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
};
|
||||
awesome_print = {
|
||||
source = {
|
||||
|
|
@ -331,12 +335,15 @@
|
|||
version = "1.4.1";
|
||||
};
|
||||
bootstrap_form = {
|
||||
dependencies = ["actionpack" "activemodel"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
|
||||
sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "4.2.0";
|
||||
};
|
||||
brakeman = {
|
||||
source = {
|
||||
|
|
@ -1054,12 +1061,14 @@
|
|||
};
|
||||
fugit = {
|
||||
dependencies = ["et-orbi" "raabro"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
|
||||
sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.1.9";
|
||||
};
|
||||
fuubar = {
|
||||
dependencies = ["rspec-core" "ruby-progressbar"];
|
||||
|
|
@ -1116,12 +1125,14 @@
|
|||
};
|
||||
gitaly-proto = {
|
||||
dependencies = ["grpc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
|
||||
sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.0";
|
||||
version = "1.19.0";
|
||||
};
|
||||
github-markup = {
|
||||
source = {
|
||||
|
|
@ -1141,12 +1152,14 @@
|
|||
version = "3.1.1";
|
||||
};
|
||||
gitlab-markup = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
|
||||
sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.5";
|
||||
version = "1.7.0";
|
||||
};
|
||||
gitlab-sidekiq-fetcher = {
|
||||
dependencies = ["sidekiq"];
|
||||
|
|
@ -1444,13 +1457,15 @@
|
|||
version = "0.6.0";
|
||||
};
|
||||
httparty = {
|
||||
dependencies = ["json" "multi_xml"];
|
||||
dependencies = ["mime-types" "multi_xml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
|
||||
sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.7";
|
||||
version = "0.16.4";
|
||||
};
|
||||
httpclient = {
|
||||
source = {
|
||||
|
|
@ -1522,14 +1537,6 @@
|
|||
};
|
||||
version = "1.4.1";
|
||||
};
|
||||
jquery-atwho-rails = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
};
|
||||
js_regex = {
|
||||
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
|
||||
source = {
|
||||
|
|
@ -2236,12 +2243,14 @@
|
|||
version = "1.2.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["development" "postgres" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
|
||||
sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
};
|
||||
po_to_json = {
|
||||
dependencies = ["json"];
|
||||
|
|
@ -2372,12 +2381,14 @@
|
|||
version = "1.1.6";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
|
||||
sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -2406,13 +2417,15 @@
|
|||
version = "1.0.2";
|
||||
};
|
||||
rack-oauth2 = {
|
||||
dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
|
||||
dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
|
||||
sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
version = "1.9.3";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -2585,12 +2598,14 @@
|
|||
};
|
||||
recaptcha = {
|
||||
dependencies = ["json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
|
||||
sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "4.13.1";
|
||||
};
|
||||
recursive-open-struct = {
|
||||
source = {
|
||||
|
|
@ -2972,12 +2987,14 @@
|
|||
version = "1.2.2";
|
||||
};
|
||||
rugged = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
|
||||
sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
};
|
||||
safe_yaml = {
|
||||
source = {
|
||||
|
|
@ -3050,15 +3067,6 @@
|
|||
};
|
||||
version = "2.3.7";
|
||||
};
|
||||
select2-rails = {
|
||||
dependencies = ["thor"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.9.3";
|
||||
};
|
||||
selenium-webdriver = {
|
||||
dependencies = ["childprocess" "rubyzip"];
|
||||
source = {
|
||||
|
|
@ -3070,12 +3078,14 @@
|
|||
};
|
||||
sentry-raven = {
|
||||
dependencies = ["faraday"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
|
||||
sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.4";
|
||||
version = "2.9.0";
|
||||
};
|
||||
settingslogic = {
|
||||
source = {
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
|
|||
gem 'omniauth-twitter', '~> 1.4'
|
||||
gem 'omniauth_crowd', '~> 2.2.0'
|
||||
gem 'omniauth-authentiq', '~> 0.3.3'
|
||||
gem 'rack-oauth2', '~> 1.2.1'
|
||||
gem 'rack-oauth2', '~> 1.9.3'
|
||||
gem 'jwt', '~> 2.1.0'
|
||||
|
||||
# Kerberos authentication. EE-only
|
||||
gem 'gssapi', group: :kerberos
|
||||
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 2.0'
|
||||
|
||||
# Two-factor authentication
|
||||
|
|
@ -126,7 +126,7 @@ gem 'faraday_middleware-aws-signers-v4'
|
|||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.8'
|
||||
gem 'deckar01-task_list', '2.2.0'
|
||||
gem 'gitlab-markup', '~> 1.6.5'
|
||||
gem 'gitlab-markup', '~> 1.7.0'
|
||||
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.17'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
|
|
@ -138,7 +138,7 @@ gem 'asciidoctor', '~> 1.5.8'
|
|||
gem 'asciidoctor-plantuml', '0.0.8'
|
||||
gem 'rouge', '~> 3.1'
|
||||
gem 'truncato', '~> 0.7.11'
|
||||
gem 'bootstrap_form', '~> 2.7.0'
|
||||
gem 'bootstrap_form', '~> 4.2.0'
|
||||
gem 'nokogiri', '~> 1.10.1'
|
||||
gem 'escape_utils', '~> 1.1'
|
||||
|
||||
|
|
@ -149,10 +149,7 @@ gem 'icalendar'
|
|||
gem 'diffy', '~> 3.1.0'
|
||||
|
||||
# Application server
|
||||
# The 2.0.6 version of rack requires monkeypatch to be present in
|
||||
# `config.ru`. This can be removed once a new update for Rack
|
||||
# is available that contains https://github.com/rack/rack/pull/1201.
|
||||
gem 'rack', '2.0.6'
|
||||
gem 'rack', '~> 2.0.7'
|
||||
|
||||
group :unicorn do
|
||||
gem 'unicorn', '~> 5.4.1'
|
||||
|
|
@ -168,7 +165,7 @@ end
|
|||
gem 'state_machines-activerecord', '~> 0.5.1'
|
||||
|
||||
# Issue tags
|
||||
gem 'acts-as-taggable-on', '~> 5.0'
|
||||
gem 'acts-as-taggable-on', '~> 6.0'
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', '~> 5.2.1'
|
||||
|
|
@ -180,7 +177,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
|
|||
gem 'fugit', '~> 1.1'
|
||||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.13.3'
|
||||
gem 'httparty', '~> 0.16.4'
|
||||
|
||||
# Colored output to console
|
||||
gem 'rainbow', '~> 3.0'
|
||||
|
|
@ -278,9 +275,7 @@ gem 'addressable', '~> 2.5.2'
|
|||
gem 'font-awesome-rails', '~> 4.7'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
gem 'gon', '~> 6.2'
|
||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
gem 'request_store', '~> 1.3'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
|
|
@ -308,6 +303,9 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres
|
|||
gem 'peek-rblineprof', '~> 0.2.0'
|
||||
gem 'peek-redis', '~> 1.2.0'
|
||||
|
||||
# Snowplow events tracking
|
||||
gem 'snowplow-tracker', '~> 0.6.1'
|
||||
|
||||
# Metrics
|
||||
group :metrics do
|
||||
gem 'method_source', '~> 0.8', require: false
|
||||
|
|
@ -439,7 +437,7 @@ group :ed25519 do
|
|||
end
|
||||
|
||||
# Gitaly GRPC client
|
||||
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
|
||||
gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
|
||||
|
||||
gem 'grpc', '~> 1.15.0'
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ GEM
|
|||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
acts-as-taggable-on (5.0.0)
|
||||
activerecord (>= 4.2.8)
|
||||
acts-as-taggable-on (6.0.0)
|
||||
activerecord (~> 5.0)
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
|
|
@ -65,7 +65,7 @@ GEM
|
|||
atomic (1.1.99)
|
||||
attr_encrypted (3.1.0)
|
||||
encryptor (~> 3.0.0)
|
||||
attr_required (1.0.0)
|
||||
attr_required (1.0.1)
|
||||
awesome_print (1.8.0)
|
||||
aws-sdk (2.9.32)
|
||||
aws-sdk-resources (= 2.9.32)
|
||||
|
|
@ -95,7 +95,9 @@ GEM
|
|||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.4.1)
|
||||
msgpack (~> 1.0)
|
||||
bootstrap_form (2.7.0)
|
||||
bootstrap_form (4.2.0)
|
||||
actionpack (>= 5.0)
|
||||
activemodel (>= 5.0)
|
||||
brakeman (4.2.1)
|
||||
browser (2.5.3)
|
||||
builder (3.2.3)
|
||||
|
|
@ -142,6 +144,7 @@ GEM
|
|||
concurrent-ruby-ext (1.1.3)
|
||||
concurrent-ruby (= 1.1.3)
|
||||
connection_pool (2.2.2)
|
||||
contracts (0.11.0)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
crass (1.0.4)
|
||||
|
|
@ -284,7 +287,7 @@ GEM
|
|||
foreman (0.84.0)
|
||||
thor (~> 0.19.1)
|
||||
formatador (0.2.5)
|
||||
fugit (1.1.7)
|
||||
fugit (1.1.9)
|
||||
et-orbi (~> 1.1, >= 1.1.7)
|
||||
raabro (~> 1.1)
|
||||
fuubar (2.2.0)
|
||||
|
|
@ -303,13 +306,13 @@ GEM
|
|||
gettext_i18n_rails (>= 0.7.1)
|
||||
po_to_json (>= 1.0.0)
|
||||
rails (>= 3.2.0)
|
||||
gitaly-proto (1.13.0)
|
||||
gitaly-proto (1.19.0)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab-default_value_for (3.1.1)
|
||||
activerecord (>= 3.2.0, < 6.0)
|
||||
gitlab-license (1.0.0)
|
||||
gitlab-markup (1.6.5)
|
||||
gitlab-markup (1.7.0)
|
||||
gitlab-sidekiq-fetcher (0.4.0)
|
||||
sidekiq (~> 5)
|
||||
gitlab-styles (2.5.1)
|
||||
|
|
@ -409,8 +412,8 @@ GEM
|
|||
domain_name (~> 0.5)
|
||||
http-form_data (2.1.1)
|
||||
http_parser.rb (0.6.0)
|
||||
httparty (0.13.7)
|
||||
json (~> 1.8)
|
||||
httparty (0.16.4)
|
||||
mime-types (~> 3.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.6.0)
|
||||
|
|
@ -429,7 +432,6 @@ GEM
|
|||
multipart-post
|
||||
oauth (~> 0.5, >= 0.5.0)
|
||||
jmespath (1.3.1)
|
||||
jquery-atwho-rails (1.3.2)
|
||||
js_regex (3.1.1)
|
||||
character_set (~> 1.1)
|
||||
regexp_parser (~> 1.1)
|
||||
|
|
@ -617,7 +619,7 @@ GEM
|
|||
atomic (>= 1.0.0)
|
||||
peek
|
||||
redis
|
||||
pg (1.1.3)
|
||||
pg (1.1.4)
|
||||
po_to_json (1.0.1)
|
||||
json (>= 1.6.0)
|
||||
powerpack (0.1.1)
|
||||
|
|
@ -649,18 +651,18 @@ GEM
|
|||
puma (>= 2.7, < 4)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.1.6)
|
||||
rack (2.0.6)
|
||||
rack (2.0.7)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (4.4.1)
|
||||
rack
|
||||
rack-cors (1.0.2)
|
||||
rack-oauth2 (1.2.3)
|
||||
activesupport (>= 2.3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.4)
|
||||
multi_json (>= 1.3.6)
|
||||
rack (>= 1.1)
|
||||
rack-oauth2 (1.9.3)
|
||||
activesupport
|
||||
attr_required
|
||||
httpclient
|
||||
json-jwt (>= 1.9.0)
|
||||
rack
|
||||
rack-protection (2.0.5)
|
||||
rack
|
||||
rack-proxy (0.6.0)
|
||||
|
|
@ -713,7 +715,7 @@ GEM
|
|||
optimist (>= 3.0.0)
|
||||
rdoc (6.0.4)
|
||||
re2 (1.1.1)
|
||||
recaptcha (3.0.0)
|
||||
recaptcha (4.13.1)
|
||||
json
|
||||
recursive-open-struct (1.1.0)
|
||||
redis (3.3.5)
|
||||
|
|
@ -818,7 +820,7 @@ GEM
|
|||
rubyntlm (0.6.2)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (1.2.2)
|
||||
rugged (0.28.0)
|
||||
rugged (0.28.1)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
|
|
@ -844,12 +846,10 @@ GEM
|
|||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
select2-rails (3.5.9.3)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (3.12.0)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.2)
|
||||
sentry-raven (2.7.4)
|
||||
sentry-raven (2.9.0)
|
||||
faraday (>= 0.7.6, < 1.0)
|
||||
settingslogic (2.0.9)
|
||||
sexp_processor (4.11.0)
|
||||
|
|
@ -877,6 +877,8 @@ GEM
|
|||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
slack-notifier (1.5.1)
|
||||
snowplow-tracker (0.6.1)
|
||||
contracts (~> 0.7, <= 0.11)
|
||||
spring (2.0.2)
|
||||
activesupport (>= 4.2)
|
||||
spring-commands-rspec (1.0.4)
|
||||
|
|
@ -984,7 +986,7 @@ DEPENDENCIES
|
|||
RedCloth (~> 4.3.2)
|
||||
ace-rails-ap (~> 4.1.0)
|
||||
activerecord_sane_schema_dumper (= 1.0)
|
||||
acts-as-taggable-on (~> 5.0)
|
||||
acts-as-taggable-on (~> 6.0)
|
||||
addressable (~> 2.5.2)
|
||||
akismet (~> 2.0)
|
||||
asana (~> 0.8.1)
|
||||
|
|
@ -1001,7 +1003,7 @@ DEPENDENCIES
|
|||
better_errors (~> 2.5.0)
|
||||
binding_of_caller (~> 0.8.0)
|
||||
bootsnap (~> 1.4)
|
||||
bootstrap_form (~> 2.7.0)
|
||||
bootstrap_form (~> 4.2.0)
|
||||
brakeman (~> 4.2)
|
||||
browser (~> 2.5)
|
||||
bullet (~> 5.5.0)
|
||||
|
|
@ -1056,11 +1058,11 @@ DEPENDENCIES
|
|||
gettext (~> 3.2.2)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly-proto (~> 1.13.0)
|
||||
gitaly-proto (~> 1.19.0)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-default_value_for (~> 3.1.1)
|
||||
gitlab-license (~> 1.0)
|
||||
gitlab-markup (~> 1.6.5)
|
||||
gitlab-markup (~> 1.7.0)
|
||||
gitlab-sidekiq-fetcher (~> 0.4.0)
|
||||
gitlab-styles (~> 2.4)
|
||||
gitlab_omniauth-ldap (~> 2.1.1)
|
||||
|
|
@ -1084,12 +1086,11 @@ DEPENDENCIES
|
|||
hipchat (~> 1.5.0)
|
||||
html-pipeline (~> 2.8)
|
||||
html2text
|
||||
httparty (~> 0.13.3)
|
||||
httparty (~> 0.16.4)
|
||||
icalendar
|
||||
influxdb (~> 0.2)
|
||||
jaeger-client (~> 0.10.0)
|
||||
jira-ruby (~> 1.4)
|
||||
jquery-atwho-rails (~> 1.3.2)
|
||||
js_regex (~> 3.1)
|
||||
json-schema (~> 2.8.0)
|
||||
jwt (~> 2.1.0)
|
||||
|
|
@ -1145,10 +1146,10 @@ DEPENDENCIES
|
|||
pry-rails (~> 0.3.4)
|
||||
puma (~> 3.12)
|
||||
puma_worker_killer
|
||||
rack (= 2.0.6)
|
||||
rack (~> 2.0.7)
|
||||
rack-attack (~> 4.4.1)
|
||||
rack-cors (~> 1.0.0)
|
||||
rack-oauth2 (~> 1.2.1)
|
||||
rack-oauth2 (~> 1.9.3)
|
||||
rack-proxy (~> 0.6.0)
|
||||
rails (= 5.0.7.2)
|
||||
rails-controller-testing
|
||||
|
|
@ -1160,7 +1161,7 @@ DEPENDENCIES
|
|||
rbtrace (~> 0.4)
|
||||
rdoc (~> 6.0)
|
||||
re2 (~> 1.1.1)
|
||||
recaptcha (~> 3.0)
|
||||
recaptcha (~> 4.11)
|
||||
redis (~> 3.2)
|
||||
redis-namespace (~> 1.6.0)
|
||||
redis-rails (~> 5.0.2)
|
||||
|
|
@ -1187,7 +1188,6 @@ DEPENDENCIES
|
|||
sass-rails (~> 5.0.6)
|
||||
scss_lint (~> 0.56.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
select2-rails (~> 3.5.9)
|
||||
selenium-webdriver (~> 3.12)
|
||||
sentry-raven (~> 2.7)
|
||||
settingslogic (~> 2.0.9)
|
||||
|
|
@ -1198,6 +1198,7 @@ DEPENDENCIES
|
|||
simple_po_parser (~> 1.1.2)
|
||||
simplecov (~> 0.14.0)
|
||||
slack-notifier (~> 1.5.1)
|
||||
snowplow-tracker (~> 0.6.1)
|
||||
spring (~> 2.0.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
sprockets (~> 3.7.0)
|
||||
|
|
|
|||
|
|
@ -114,12 +114,14 @@
|
|||
};
|
||||
acts-as-taggable-on = {
|
||||
dependencies = ["activerecord"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
|
||||
sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "6.0.0";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
|
|
@ -215,12 +217,14 @@
|
|||
version = "3.1.0";
|
||||
};
|
||||
attr_required = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
|
||||
sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
};
|
||||
awesome_print = {
|
||||
source = {
|
||||
|
|
@ -366,12 +370,15 @@
|
|||
version = "1.4.1";
|
||||
};
|
||||
bootstrap_form = {
|
||||
dependencies = ["actionpack" "activemodel"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
|
||||
sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "4.2.0";
|
||||
};
|
||||
brakeman = {
|
||||
source = {
|
||||
|
|
@ -576,6 +583,16 @@
|
|||
};
|
||||
version = "2.2.2";
|
||||
};
|
||||
contracts = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.0";
|
||||
};
|
||||
crack = {
|
||||
dependencies = ["safe_yaml"];
|
||||
source = {
|
||||
|
|
@ -1142,12 +1159,14 @@
|
|||
};
|
||||
fugit = {
|
||||
dependencies = ["et-orbi" "raabro"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
|
||||
sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.1.9";
|
||||
};
|
||||
fuubar = {
|
||||
dependencies = ["rspec-core" "ruby-progressbar"];
|
||||
|
|
@ -1204,12 +1223,14 @@
|
|||
};
|
||||
gitaly-proto = {
|
||||
dependencies = ["grpc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
|
||||
sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.0";
|
||||
version = "1.19.0";
|
||||
};
|
||||
github-markup = {
|
||||
source = {
|
||||
|
|
@ -1237,12 +1258,14 @@
|
|||
version = "1.0.0";
|
||||
};
|
||||
gitlab-markup = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
|
||||
sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.5";
|
||||
version = "1.7.0";
|
||||
};
|
||||
gitlab-sidekiq-fetcher = {
|
||||
dependencies = ["sidekiq"];
|
||||
|
|
@ -1549,13 +1572,15 @@
|
|||
version = "0.6.0";
|
||||
};
|
||||
httparty = {
|
||||
dependencies = ["json" "multi_xml"];
|
||||
dependencies = ["mime-types" "multi_xml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
|
||||
sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.7";
|
||||
version = "0.16.4";
|
||||
};
|
||||
httpclient = {
|
||||
source = {
|
||||
|
|
@ -1635,14 +1660,6 @@
|
|||
};
|
||||
version = "1.3.1";
|
||||
};
|
||||
jquery-atwho-rails = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
};
|
||||
js_regex = {
|
||||
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
|
||||
source = {
|
||||
|
|
@ -2365,12 +2382,14 @@
|
|||
version = "1.2.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["development" "postgres" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
|
||||
sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
};
|
||||
po_to_json = {
|
||||
dependencies = ["json"];
|
||||
|
|
@ -2501,12 +2520,14 @@
|
|||
version = "1.1.6";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
|
||||
sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -2535,13 +2556,15 @@
|
|||
version = "1.0.2";
|
||||
};
|
||||
rack-oauth2 = {
|
||||
dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
|
||||
dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
|
||||
sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
version = "1.9.3";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -2714,12 +2737,14 @@
|
|||
};
|
||||
recaptcha = {
|
||||
dependencies = ["json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
|
||||
sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "4.13.1";
|
||||
};
|
||||
recursive-open-struct = {
|
||||
source = {
|
||||
|
|
@ -3101,12 +3126,14 @@
|
|||
version = "1.2.2";
|
||||
};
|
||||
rugged = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
|
||||
sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
};
|
||||
safe_yaml = {
|
||||
source = {
|
||||
|
|
@ -3179,15 +3206,6 @@
|
|||
};
|
||||
version = "2.3.7";
|
||||
};
|
||||
select2-rails = {
|
||||
dependencies = ["thor"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.9.3";
|
||||
};
|
||||
selenium-webdriver = {
|
||||
dependencies = ["childprocess" "rubyzip"];
|
||||
source = {
|
||||
|
|
@ -3199,12 +3217,14 @@
|
|||
};
|
||||
sentry-raven = {
|
||||
dependencies = ["faraday"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
|
||||
sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.4";
|
||||
version = "2.9.0";
|
||||
};
|
||||
settingslogic = {
|
||||
source = {
|
||||
|
|
@ -3300,6 +3320,17 @@
|
|||
};
|
||||
version = "1.5.1";
|
||||
};
|
||||
snowplow-tracker = {
|
||||
dependencies = ["contracts"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.1";
|
||||
};
|
||||
spring = {
|
||||
dependencies = ["activesupport"];
|
||||
source = {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import logging
|
|||
import subprocess
|
||||
import json
|
||||
import pathlib
|
||||
from distutils.version import LooseVersion
|
||||
from typing import Iterable
|
||||
|
||||
import requests
|
||||
|
|
@ -18,6 +19,7 @@ logger = logging.getLogger(__name__)
|
|||
|
||||
|
||||
class GitLabRepo:
|
||||
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?")
|
||||
def __init__(self, owner: str, repo: str):
|
||||
self.owner = owner
|
||||
self.repo = repo
|
||||
|
|
@ -31,8 +33,13 @@ class GitLabRepo:
|
|||
r = requests.get(self.url + "/tags?format=atom", stream=True)
|
||||
|
||||
tree = ElementTree.fromstring(r.content)
|
||||
return sorted((e.text for e in tree.findall(
|
||||
'{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True)
|
||||
versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')]
|
||||
# filter out versions not matching version_regex
|
||||
versions = filter(self.version_regex.match, versions)
|
||||
|
||||
# sort, but ignore v and -ee for sorting comparisons
|
||||
versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)
|
||||
return versions
|
||||
|
||||
def get_git_hash(self, rev: str):
|
||||
out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
|
||||
|
|
@ -202,7 +209,6 @@ def update_gitaly():
|
|||
click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}")
|
||||
|
||||
|
||||
|
||||
@cli.command('update-gitlab-shell')
|
||||
def update_gitlab_shell():
|
||||
"""Update gitlab-shell"""
|
||||
|
|
|
|||
Loading…
Reference in a new issue