mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 02:44:17 +03:00
Merge pull request #147848 from yayayayaka/gitlab-14.5.0
gitlab: 14.4.2 -> 14.5.0
This commit is contained in:
Kim Lindberger
GitHub
commit
5ef642624c
@ -1,14 +1,14 @@
|
||||
{
|
||||
"version": "14.4.2",
|
||||
"repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2",
|
||||
"yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",
|
||||
"version": "14.5.0",
|
||||
"repo_hash": "sha256-HKm2zxr9jHN5NvoKoR0YnEsna84oz+ax6BYmDiWrODc=",
|
||||
"yarn_hash": "081c06ds723mv95ivpnlh3ida2ra3brrm1lzfh2pmlg5wz9vi1cs",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.4.2-ee",
|
||||
"rev": "v14.5.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.4.2",
|
||||
"GITLAB_PAGES_VERSION": "1.46.0",
|
||||
"GITLAB_SHELL_VERSION": "13.21.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.4.2"
|
||||
"GITALY_SERVER_VERSION": "14.5.0",
|
||||
"GITLAB_PAGES_VERSION": "1.48.0",
|
||||
"GITLAB_SHELL_VERSION": "13.22.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.5.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'github-linguist', '~> 7.12', require: 'linguist'
|
||||
gem 'gitlab-markup', '~> 1.7.1'
|
||||
gem 'activesupport', '~> 6.1.4.1'
|
||||
|
||||
@ -121,7 +121,7 @@ GEM
|
||||
parallel (1.19.2)
|
||||
parser (2.7.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg_query (2.1.0)
|
||||
pg_query (2.1.1)
|
||||
google-protobuf (>= 3.17.1)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
@ -184,7 +184,7 @@ GEM
|
||||
rubocop-ast (0.2.0)
|
||||
parser (>= 2.7.0.1)
|
||||
ruby-progressbar (1.10.1)
|
||||
rugged (1.1.0)
|
||||
rugged (1.2.0)
|
||||
sanitize (4.6.6)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
@ -234,7 +234,7 @@ DEPENDENCIES
|
||||
rspec
|
||||
rspec-parameterized
|
||||
rubocop (~> 0.69)
|
||||
rugged (~> 1.1)
|
||||
rugged (~> 1.2)
|
||||
sentry-raven (~> 3.0)
|
||||
timecop
|
||||
|
||||
|
||||
@ -4,6 +4,18 @@
|
||||
, libgit2, openssl, zlib, pcre, http-parser }:
|
||||
|
||||
let
|
||||
# git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0.
|
||||
# It needs a specific commit in between those two releases.
|
||||
libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec {
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
repo = "libgit2";
|
||||
rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e";
|
||||
sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI=";
|
||||
};
|
||||
});
|
||||
|
||||
rubyEnv = bundlerEnv rec {
|
||||
name = "gitaly-env";
|
||||
inherit ruby;
|
||||
@ -21,7 +33,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
version = "14.4.2";
|
||||
version = "14.5.0";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
@ -33,10 +45,10 @@ buildGoModule {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo=";
|
||||
sha256 = "sha256-DbyxZKxW+S2u23+F8VQxkDXWp+L1WeISs6OEBb5DavA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
|
||||
vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";
|
||||
|
||||
passthru = {
|
||||
inherit rubyEnv;
|
||||
@ -46,7 +58,7 @@ buildGoModule {
|
||||
|
||||
tags = [ "static,system_libgit2" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ];
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -554,10 +554,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx";
|
||||
sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
};
|
||||
proc_to_ast = {
|
||||
dependencies = ["coderay" "parser" "unparser"];
|
||||
@ -830,10 +830,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
|
||||
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
sanitize = {
|
||||
dependencies = ["crass" "nokogiri" "nokogumbo"];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "13.21.1";
|
||||
version = "13.22.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FBkxJLl58ZbqM1P4LohsozGiKg38gQwVGOV9AAjVE0M=";
|
||||
sha256 = "sha256-jMFTNyGdegdBO+f6Pw36iuhvyzcM8rCbnfSyLSOiEjY=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
||||
@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.4.2";
|
||||
version = "14.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
||||
@ -4,7 +4,7 @@ source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 6.1.4.1'
|
||||
|
||||
gem 'bootsnap', '~> 1.4.6'
|
||||
gem 'bootsnap', '~> 1.9.1', require: false
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 3.0'
|
||||
@ -17,14 +17,14 @@ gem 'default_value_for', '~> 3.4.0'
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.1'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'grape-path-helpers', '~> 1.7.0'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
gem 'marginalia', '~> 1.10.0'
|
||||
|
||||
# Authorization
|
||||
gem 'declarative_policy', '~> 1.0.0'
|
||||
gem 'declarative_policy', '~> 1.1.0'
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.7.2'
|
||||
@ -38,6 +38,7 @@ gem 'omniauth-auth0', '~> 2.0.0'
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
|
||||
gem 'omniauth-cas3', '~> 1.1.4'
|
||||
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
gem 'omniauth-github', '~> 1.4'
|
||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||
@ -129,7 +130,7 @@ gem 'fog-local', '~> 0.6'
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
@ -186,6 +187,7 @@ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
||||
group :puma do
|
||||
gem 'puma', '~> 5.3.1', require: false
|
||||
gem 'puma_worker_killer', '~> 0.3.1', require: false
|
||||
gem 'sd_notify', '~> 0.1.0', require: false
|
||||
end
|
||||
|
||||
# State machine
|
||||
@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
|
||||
gem 'terser', '1.0.2'
|
||||
|
||||
gem 'addressable', '~> 2.8'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
gem 'tanuki_emoji', '~> 0.5'
|
||||
gem 'gon', '~> 6.4.0'
|
||||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
@ -341,13 +343,15 @@ group :development do
|
||||
gem 'lefthook', '~> 0.7.0', require: false
|
||||
gem 'solargraph', '~> 0.43', require: false
|
||||
|
||||
gem 'letter_opener_web', '~> 1.4.1'
|
||||
gem 'letter_opener_web', '~> 2.0.0'
|
||||
|
||||
# Better errors handler
|
||||
gem 'better_errors', '~> 2.9.0'
|
||||
|
||||
# thin instead webrick
|
||||
gem 'thin', '~> 1.8.0'
|
||||
|
||||
gem 'sprite-factory', '~> 1.7'
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
@ -372,7 +376,7 @@ group :development, :test do
|
||||
gem 'spring', '~> 2.1.0'
|
||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
|
||||
gem 'gitlab-styles', '~> 6.3.0', require: false
|
||||
gem 'gitlab-styles', '~> 6.4.0', require: false
|
||||
|
||||
gem 'haml_lint', '~> 0.36.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
@ -396,7 +400,7 @@ group :development, :test do
|
||||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 2.5.0', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
@ -474,7 +478,7 @@ end
|
||||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 14.3.0.pre.rc2'
|
||||
gem 'gitaly', '~> 14.4.0.pre.rc43'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
@ -535,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3'
|
||||
|
||||
gem 'parslet', '~> 1.8'
|
||||
|
||||
gem 'sd_notify'
|
||||
gem 'ipynbdiff', '0.3.7'
|
||||
|
||||
@ -141,7 +141,7 @@ GEM
|
||||
rack (>= 0.9.0)
|
||||
bindata (2.4.10)
|
||||
binding_ninja (0.2.3)
|
||||
bootsnap (1.4.6)
|
||||
bootsnap (1.9.1)
|
||||
msgpack (~> 1.0)
|
||||
bootstrap_form (4.2.0)
|
||||
actionpack (>= 5.0)
|
||||
@ -215,7 +215,7 @@ GEM
|
||||
css_parser (1.7.0)
|
||||
addressable
|
||||
daemons (1.3.1)
|
||||
danger (8.3.1)
|
||||
danger (8.4.1)
|
||||
claide (~> 1.0)
|
||||
claide-plugins (>= 0.9.2)
|
||||
colored2 (~> 3.1)
|
||||
@ -237,7 +237,7 @@ GEM
|
||||
html-pipeline
|
||||
declarative (0.0.20)
|
||||
declarative-option (0.1.0)
|
||||
declarative_policy (1.0.0)
|
||||
declarative_policy (1.1.0)
|
||||
default_value_for (3.4.0)
|
||||
activerecord (>= 3.2.0, < 7.0)
|
||||
deprecation_toolkit (1.5.1)
|
||||
@ -429,8 +429,6 @@ GEM
|
||||
ruby-progressbar (~> 1.4)
|
||||
fuzzyurl (0.9.0)
|
||||
gemoji (3.0.1)
|
||||
gemojione (3.3.0)
|
||||
json
|
||||
get_process_mem (0.2.5)
|
||||
ffi (~> 1.0)
|
||||
gettext (3.3.6)
|
||||
@ -445,7 +443,7 @@ GEM
|
||||
rails (>= 3.2.0)
|
||||
git (1.7.0)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (14.3.0.pre.rc2)
|
||||
gitaly (14.4.0.pre.rc43)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab (4.16.1)
|
||||
@ -453,7 +451,7 @@ GEM
|
||||
terminal-table (~> 1.5, >= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (2.3.0)
|
||||
gitlab-dangerfiles (2.5.0)
|
||||
danger (>= 8.3.1)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
gitlab-experiment (0.6.4)
|
||||
@ -485,7 +483,7 @@ GEM
|
||||
openid_connect (~> 1.2)
|
||||
gitlab-sidekiq-fetcher (0.8.0)
|
||||
sidekiq (~> 6.1)
|
||||
gitlab-styles (6.3.0)
|
||||
gitlab-styles (6.4.0)
|
||||
rubocop (~> 0.91, >= 0.91.1)
|
||||
rubocop-gitlab-security (~> 0.1.1)
|
||||
rubocop-performance (~> 1.9.2)
|
||||
@ -635,6 +633,9 @@ GEM
|
||||
invisible_captcha (1.1.0)
|
||||
rails (>= 4.2)
|
||||
ipaddress (0.8.3)
|
||||
ipynbdiff (0.3.7)
|
||||
diffy (= 3.3.0)
|
||||
json (= 2.5.1)
|
||||
jaeger-client (1.1.0)
|
||||
opentracing (~> 0.3)
|
||||
thrift
|
||||
@ -692,10 +693,11 @@ GEM
|
||||
lefthook (0.7.5)
|
||||
letter_opener (1.7.0)
|
||||
launchy (~> 2.2)
|
||||
letter_opener_web (1.4.1)
|
||||
actionmailer (>= 3.2)
|
||||
letter_opener (~> 1.0)
|
||||
railties (>= 3.2)
|
||||
letter_opener_web (2.0.0)
|
||||
actionmailer (>= 5.2)
|
||||
letter_opener (~> 1.7)
|
||||
railties (>= 5.2)
|
||||
rexml
|
||||
libyajl2 (1.2.0)
|
||||
license_finder (6.0.0)
|
||||
bundler
|
||||
@ -832,6 +834,8 @@ GEM
|
||||
addressable (~> 2.3)
|
||||
nokogiri (~> 1.7, >= 1.7.1)
|
||||
omniauth (~> 1.2)
|
||||
omniauth-dingtalk-oauth2 (1.0.0)
|
||||
omniauth-oauth2 (~> 1.7.1)
|
||||
omniauth-facebook (4.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-github (1.4.0)
|
||||
@ -852,7 +856,7 @@ GEM
|
||||
omniauth-oauth (1.1.0)
|
||||
oauth
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (1.7.1)
|
||||
omniauth-oauth2 (1.7.2)
|
||||
oauth2 (~> 1.4)
|
||||
omniauth (>= 1.9, < 3)
|
||||
omniauth-oauth2-generic (0.2.2)
|
||||
@ -1122,7 +1126,7 @@ GEM
|
||||
rubyntlm (0.6.2)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (2.0.0)
|
||||
rugged (1.1.0)
|
||||
rugged (1.2.0)
|
||||
safe_yaml (1.0.4)
|
||||
safety_net_attestation (0.4.0)
|
||||
jwt (~> 2.0)
|
||||
@ -1148,7 +1152,7 @@ GEM
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
scientist (1.6.0)
|
||||
sd_notify (0.1.1)
|
||||
sd_notify (0.1.0)
|
||||
securecompare (1.0.0)
|
||||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
@ -1210,6 +1214,7 @@ GEM
|
||||
spring (2.1.1)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprite-factory (1.7.1)
|
||||
sprockets (3.7.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
@ -1240,6 +1245,7 @@ GEM
|
||||
sys-filesystem (1.1.9)
|
||||
ffi
|
||||
sysexits (1.2.0)
|
||||
tanuki_emoji (0.5.0)
|
||||
temple (0.8.2)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
@ -1393,7 +1399,7 @@ DEPENDENCIES
|
||||
benchmark-ips (~> 2.3.0)
|
||||
benchmark-memory (~> 0.1)
|
||||
better_errors (~> 2.9.0)
|
||||
bootsnap (~> 1.4.6)
|
||||
bootsnap (~> 1.9.1)
|
||||
bootstrap_form (~> 4.2.0)
|
||||
browser (~> 4.2)
|
||||
bullet (~> 6.1.3)
|
||||
@ -1410,7 +1416,7 @@ DEPENDENCIES
|
||||
crystalball (~> 0.7.0)
|
||||
database_cleaner (~> 1.7.0)
|
||||
deckar01-task_list (= 2.3.1)
|
||||
declarative_policy (~> 1.0.0)
|
||||
declarative_policy (~> 1.1.0)
|
||||
default_value_for (~> 3.4.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
@ -1448,14 +1454,13 @@ DEPENDENCIES
|
||||
fog-rackspace (~> 0.1.1)
|
||||
fugit (~> 1.2.1)
|
||||
fuubar (~> 2.2.0)
|
||||
gemojione (~> 3.3)
|
||||
gettext (~> 3.3)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly (~> 14.3.0.pre.rc2)
|
||||
gitaly (~> 14.4.0.pre.rc43)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 2.3.0)
|
||||
gitlab-dangerfiles (~> 2.5.0)
|
||||
gitlab-experiment (~> 0.6.4)
|
||||
gitlab-fog-azure-rm (~> 1.2.0)
|
||||
gitlab-labkit (~> 0.21.1)
|
||||
@ -1465,7 +1470,7 @@ DEPENDENCIES
|
||||
gitlab-net-dns (~> 0.9.1)
|
||||
gitlab-omniauth-openid-connect (~> 0.8.0)
|
||||
gitlab-sidekiq-fetcher (= 0.8.0)
|
||||
gitlab-styles (~> 6.3.0)
|
||||
gitlab-styles (~> 6.4.0)
|
||||
gitlab_chronic_duration (~> 0.10.6.2)
|
||||
gitlab_omniauth-ldap (~> 2.1.1)
|
||||
gon (~> 6.4.0)
|
||||
@ -1495,6 +1500,7 @@ DEPENDENCIES
|
||||
icalendar
|
||||
invisible_captcha (~> 1.1.0)
|
||||
ipaddress (~> 0.8.3)
|
||||
ipynbdiff (= 0.3.7)
|
||||
jira-ruby (~> 2.1.4)
|
||||
js_regex (~> 3.7)
|
||||
json (~> 2.5.1)
|
||||
@ -1506,7 +1512,7 @@ DEPENDENCIES
|
||||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.9.2)
|
||||
lefthook (~> 0.7.0)
|
||||
letter_opener_web (~> 1.4.1)
|
||||
letter_opener_web (~> 2.0.0)
|
||||
license_finder (~> 6.0)
|
||||
licensee (~> 9.14.1)
|
||||
lockbox (~> 0.6.2)
|
||||
@ -1535,6 +1541,7 @@ DEPENDENCIES
|
||||
omniauth-azure-activedirectory-v2 (~> 1.0)
|
||||
omniauth-azure-oauth2 (~> 0.0.9)
|
||||
omniauth-cas3 (~> 1.1.4)
|
||||
omniauth-dingtalk-oauth2 (~> 1.0)
|
||||
omniauth-facebook (~> 4.0.0)
|
||||
omniauth-github (~> 1.4)
|
||||
omniauth-gitlab (~> 1.0.2)
|
||||
@ -1596,10 +1603,10 @@ DEPENDENCIES
|
||||
ruby-saml (~> 1.13.0)
|
||||
ruby_parser (~> 3.15)
|
||||
rubyzip (~> 2.0.0)
|
||||
rugged (~> 1.1)
|
||||
rugged (~> 1.2)
|
||||
sanitize (~> 5.2.1)
|
||||
sassc-rails (~> 2.1.0)
|
||||
sd_notify
|
||||
sd_notify (~> 0.1.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
selenium-webdriver (~> 3.142)
|
||||
sentry-raven (~> 3.1)
|
||||
@ -1616,11 +1623,13 @@ DEPENDENCIES
|
||||
spamcheck (~> 0.1.0)
|
||||
spring (~> 2.1.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
sprite-factory (~> 1.7)
|
||||
sprockets (~> 3.7.0)
|
||||
sshkey (~> 2.0)
|
||||
stackprof (~> 0.2.15)
|
||||
state_machines-activerecord (~> 0.8.0)
|
||||
sys-filesystem (~> 1.1.6)
|
||||
tanuki_emoji (~> 0.5)
|
||||
terser (= 1.0.2)
|
||||
test-prof (~> 1.0.7)
|
||||
test_file_finder (~> 0.1.3)
|
||||
|
||||
@ -557,10 +557,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bz62p9vc7lcrmzhiz4pf7myww086mq287cw3jjj7fyc7jhmamw0";
|
||||
sha256 = "1ndjra3h86dq28njm2swmaw6n3vsywrycrf7i5iy9l8hrhfhv4x2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.6";
|
||||
version = "1.9.1";
|
||||
};
|
||||
bootstrap_form = {
|
||||
dependencies = ["actionpack" "activemodel"];
|
||||
@ -931,10 +931,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l";
|
||||
sha256 = "1f9p7sdj542cbn352qz58m4n26kamv6vbnxzpc06j0pxi50z3i0v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.3.1";
|
||||
version = "8.4.1";
|
||||
};
|
||||
danger-gitlab = {
|
||||
dependencies = ["danger" "gitlab"];
|
||||
@ -1007,10 +1007,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k2wl0jr0jq64gy7ibb1ipm2dzqil7y66vyffwx81g7sqchh7xh6";
|
||||
sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
};
|
||||
default_value_for = {
|
||||
dependencies = ["activerecord"];
|
||||
@ -1838,17 +1838,6 @@
|
||||
};
|
||||
version = "3.0.1";
|
||||
};
|
||||
gemojione = {
|
||||
dependencies = ["json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0";
|
||||
};
|
||||
get_process_mem = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default" "puma" "unicorn"];
|
||||
@ -1910,10 +1899,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "197db842msm326ib8r3gqlavf5d11r4cd9jg4wjnyar3ccyr9dn7";
|
||||
sha256 = "022amhic8rs09qmp3hy1zz5inxbxnrvg8j82bq4l2s8ml9hqfs3a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "14.3.0.pre.rc2";
|
||||
version = "14.4.0.pre.rc43";
|
||||
};
|
||||
github-markup = {
|
||||
groups = ["default"];
|
||||
@ -1953,10 +1942,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw";
|
||||
sha256 = "1488s24c9fm55z2a2pbry2fjx72fzgzv0y48krgldvf0qy43l0kz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store" "scientist"];
|
||||
@ -2059,10 +2048,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vxg5j9405r5xvwnswhm2r7pg9pn6pqg675pxz6f8d3sxy5z963p";
|
||||
sha256 = "16d90sd0x6qfkhgfjysswwrzk82zs82xs9azn9w287irpzdkvj7f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.3.0";
|
||||
version = "6.4.0";
|
||||
};
|
||||
gitlab_chronic_duration = {
|
||||
dependencies = ["numerizer"];
|
||||
@ -2589,6 +2578,17 @@
|
||||
};
|
||||
version = "0.8.3";
|
||||
};
|
||||
ipynbdiff = {
|
||||
dependencies = ["diffy" "json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18337bzcwssmnyg2wf3za50z0zh2b1sh17wgaapavd1ffr24svkx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.7";
|
||||
};
|
||||
jaeger-client = {
|
||||
dependencies = ["opentracing" "thrift"];
|
||||
groups = ["default"];
|
||||
@ -2826,15 +2826,15 @@
|
||||
version = "1.7.0";
|
||||
};
|
||||
letter_opener_web = {
|
||||
dependencies = ["actionmailer" "letter_opener" "railties"];
|
||||
dependencies = ["actionmailer" "letter_opener" "railties" "rexml"];
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kgz2n0cyw3m8ipvijlikb6bldmzhnq451b9d7w5l74gw2fhqckg";
|
||||
sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
libyajl2 = {
|
||||
groups = ["default"];
|
||||
@ -3489,6 +3489,17 @@
|
||||
};
|
||||
version = "1.1.4";
|
||||
};
|
||||
omniauth-dingtalk-oauth2 = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
omniauth-facebook = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
groups = ["default"];
|
||||
@ -3572,10 +3583,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319";
|
||||
sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
};
|
||||
omniauth-oauth2-generic = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
@ -4778,10 +4789,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
|
||||
sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default" "test"];
|
||||
@ -4881,14 +4892,14 @@
|
||||
version = "1.6.0";
|
||||
};
|
||||
sd_notify = {
|
||||
groups = ["default"];
|
||||
groups = ["puma"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb";
|
||||
sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.1.0";
|
||||
};
|
||||
securecompare = {
|
||||
groups = ["default"];
|
||||
@ -5144,6 +5155,16 @@
|
||||
};
|
||||
version = "1.0.4";
|
||||
};
|
||||
sprite-factory = {
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.1";
|
||||
};
|
||||
sprockets = {
|
||||
dependencies = ["concurrent-ruby" "rack"];
|
||||
groups = ["default" "development" "test"];
|
||||
@ -5291,6 +5312,16 @@
|
||||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
tanuki_emoji = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
temple = {
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
|
||||
@ -143,7 +143,6 @@ def update_rubyenv():
|
||||
f.write(repo.get_file('Gemfile.lock', rev))
|
||||
with open(rubyenv_dir / 'Gemfile', 'w') as f:
|
||||
original = repo.get_file('Gemfile', rev)
|
||||
original += "\ngem 'sd_notify'\n"
|
||||
f.write(re.sub(r".*mail-smtp_pool.*", "", original))
|
||||
|
||||
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
|
||||
|
||||
@ -5765,9 +5765,7 @@ with pkgs;
|
||||
|
||||
gitleaks = callPackage ../tools/security/gitleaks { };
|
||||
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
|
||||
libgit2 = libgit2_1_1; # git2go only supports v1.1.x
|
||||
};
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
|
||||
|
||||
gitstats = callPackage ../applications/version-management/gitstats { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user