Merge pull request #76193 from talyz/gitlab-12.6.0

gitlab: 12.5.5 -> 12.6.2
This commit is contained in:
Florian Klink 2020-01-03 18:39:24 +01:00 committed by GitHub
commit cd9cbb1108
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 984 additions and 338 deletions

View file

@ -1,13 +1,13 @@
{
"version": "12.5.5",
"repo_hash": "1vafy31s2sbs6xc2cp457k535yyawz630i8ks22ypyg2m2gy5n5m",
"version": "12.6.2",
"repo_hash": "0bchamvr3f0ph49f7xa76gsp2mjj1ajy4q0wy1hjvr9bayxx94av",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.5.5-ee",
"rev": "v12.6.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.72.1",
"GITALY_SERVER_VERSION": "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83",
"GITLAB_PAGES_VERSION": "1.12.0",
"GITLAB_SHELL_VERSION": "10.2.0",
"GITLAB_WORKHORSE_VERSION": "8.14.1"
"GITLAB_SHELL_VERSION": "10.3.0",
"GITLAB_WORKHORSE_VERSION": "8.18.0"
}
}

View file

@ -43,7 +43,14 @@ let
pname = "gitlab-assets";
inherit version src;
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ];
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ];
# Since version 12.6.0, the rake tasks need the location of git,
# so we have to apply the location patches here too.
patches = [ ./remove-hardcoded-locations.patch ];
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.
GITLAB_LOG_PATH = "log";
configurePhase = ''
runHook preConfigure

View file

@ -99,7 +99,7 @@ GEM
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
loofah (2.3.0)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@ -111,7 +111,7 @@ GEM
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.0)
msgpack (1.3.1)
multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.10.5)
@ -176,7 +176,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.0)
rugged (0.28.3.1)
rugged (0.28.4.1)
safe_yaml (1.0.5)
sanitize (4.6.6)
crass (~> 1.0.2)

View file

@ -17,16 +17,20 @@ let
};
};
in buildGoPackage rec {
version = "1.72.1";
version = "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91";
rev = version;
sha256 = "1pxmhq1nrc8q2kk83bz5afx14hshqgzqm6j4vgmyjvbmdvgl80wv";
};
# Fix a check which assumes that hook files are writeable by their
# owner.
patches = [ ./fix-executable-check.patch ];
goPackagePath = "gitlab.com/gitlab-org/gitaly";
passthru = {

View file

@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "v1.0.0";
sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
rev = "v1.0.1";
sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
};
}
{
@ -108,6 +108,15 @@
sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
};
}
{
goPackagePath = "github.com/client9/reopen";
fetch = {
type = "git";
url = "https://github.com/client9/reopen";
rev = "v1.0.0";
sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s";
};
}
{
goPackagePath = "github.com/cloudflare/tableflip";
fetch = {
@ -338,8 +347,8 @@
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.2.0";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
rev = "v0.3.0";
sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
};
}
{
@ -581,8 +590,8 @@
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "v1.0.1";
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
rev = "v1.0.2";
sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
};
}
{
@ -639,6 +648,15 @@
sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "v1.2.0";
sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz";
};
}
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@ -833,8 +851,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "v0.0.2";
sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
rev = "v0.0.3";
sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
};
}
{
@ -846,6 +864,15 @@
sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
};
}
{
goPackagePath = "github.com/sebest/xff";
fetch = {
type = "git";
url = "https://github.com/sebest/xff";
rev = "6c115e0ffa35";
sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
};
}
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
@ -869,8 +896,8 @@
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.2.0";
sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
rev = "v1.3.0";
sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
};
}
{
@ -1067,8 +1094,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/labkit.git";
rev = "0c3fc7cdd57c";
sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i";
rev = "3253d7975ca7";
sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s";
};
}
{
@ -1139,8 +1166,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
rev = "v0.3.2";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
@ -1202,8 +1229,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{

View file

@ -0,0 +1,13 @@
diff --git a/internal/config/config.go b/internal/config/config.go
index 037c9602..3d5409dc 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -185,7 +185,7 @@ func checkExecutable(path string) error {
return err
}
- if fi.Mode()&0755 < 0755 {
+ if fi.Mode()&0555 < 0555 {
return fmt.Errorf("not executable: %v", path)
}

View file

@ -418,10 +418,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
memoizable = {
dependencies = ["thread_safe"];
@ -490,10 +490,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn";
sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
type = "gem";
};
version = "1.3.0";
version = "1.3.1";
};
multi_json = {
source = {
@ -791,10 +791,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
type = "gem";
};
version = "0.28.3.1";
version = "0.28.4.1";
};
safe_yaml = {
groups = ["default" "development" "test"];

View file

@ -2,12 +2,12 @@
buildGoPackage rec {
pname = "gitlab-shell-go";
version = "10.2.0";
version = "10.3.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj";
sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk";
};
buildInputs = [ ruby ];

View file

@ -387,22 +387,13 @@
sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
};
}
{
goPackagePath = "github.com/otiai10/curr";
fetch = {
type = "git";
url = "https://github.com/otiai10/curr";
rev = "f5a3d24e5776";
sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w";
};
}
{
goPackagePath = "github.com/otiai10/mint";
fetch = {
type = "git";
url = "https://github.com/otiai10/mint";
rev = "v1.2.4";
sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m";
rev = "v1.2.3";
sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k";
};
}
{
@ -662,8 +653,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/DataDog/dd-trace-go.v1";
rev = "v1.9.0";
sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j";
rev = "v1.7.0";
sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq";
};
}
{

View file

@ -1,7 +1,7 @@
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
diff --git a/internal/config/config.go b/internal/config/config.go
index 2231851..c869930 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
@ -29,10 +29,10 @@ index 2231851..c869930 100644
}
func newFromFile(filename string) (*Config, error) {
diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go
index f92f50b..160e287 100644
--- a/go/internal/keyline/key_line.go
+++ b/go/internal/keyline/key_line.go
diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
index c29a320..c44b701 100644
--- a/internal/keyline/key_line.go
+++ b/internal/keyline/key_line.go
@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
}
@ -43,10 +43,10 @@ index f92f50b..160e287 100644
return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
}
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
index 1416488..90a5f79 100644
index 52ac5ee..d96baa3 100644
--- a/support/gitlab_config.rb
+++ b/support/gitlab_config.rb
@@ -4,7 +4,7 @@ class GitlabConfig
@@ -7,7 +7,7 @@ class GitlabConfig
attr_reader :config
def initialize

View file

@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";
version = "8.14.1";
version = "8.18.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl";
sha256 = "0qsbz8gv9r9wfvxsh9mpspgs2gyyidxdz5n9n7ibfy7z129mx4ak";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";

View file

@ -27,6 +27,42 @@
sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly";
};
}
{
goPackagePath = "github.com/Joker/hpp";
fetch = {
type = "git";
url = "https://github.com/Joker/hpp";
rev = "6893e659854a";
sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5";
};
}
{
goPackagePath = "github.com/Joker/jade";
fetch = {
type = "git";
url = "https://github.com/Joker/jade";
rev = "v1.0.0";
sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf";
};
}
{
goPackagePath = "github.com/Shopify/goreferrer";
fetch = {
type = "git";
url = "https://github.com/Shopify/goreferrer";
rev = "ec9c9a553398";
sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn";
};
}
{
goPackagePath = "github.com/ajg/form";
fetch = {
type = "git";
url = "https://github.com/ajg/form";
rev = "v1.5.1";
sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
@ -45,6 +81,15 @@
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/aymerick/raymond";
fetch = {
type = "git";
url = "https://github.com/aymerick/raymond";
rev = "v2.0.2";
sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
@ -99,6 +144,15 @@
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
{
goPackagePath = "github.com/codegangsta/inject";
fetch = {
type = "git";
url = "https://github.com/codegangsta/inject";
rev = "33e0aa1cb7c0";
sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@ -117,6 +171,33 @@
sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
rev = "cdade1c07385";
sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
{
goPackagePath = "github.com/fatih/structs";
fetch = {
type = "git";
url = "https://github.com/fatih/structs";
rev = "v1.1.0";
sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
};
}
{
goPackagePath = "github.com/flosch/pongo2";
fetch = {
type = "git";
url = "https://github.com/flosch/pongo2";
rev = "bbf5a6c351f4";
sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@ -126,6 +207,15 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/gavv/monotime";
fetch = {
type = "git";
url = "https://github.com/gavv/monotime";
rev = "30dba4353424";
sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g";
};
}
{
goPackagePath = "github.com/getsentry/raven-go";
fetch = {
@ -135,6 +225,51 @@
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
};
}
{
goPackagePath = "github.com/getsentry/sentry-go";
fetch = {
type = "git";
url = "https://github.com/getsentry/sentry-go";
rev = "v0.3.0";
sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1";
};
}
{
goPackagePath = "github.com/gin-contrib/sse";
fetch = {
type = "git";
url = "https://github.com/gin-contrib/sse";
rev = "5545eab6dad3";
sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5";
};
}
{
goPackagePath = "github.com/gin-gonic/gin";
fetch = {
type = "git";
url = "https://github.com/gin-gonic/gin";
rev = "v1.4.0";
sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
};
}
{
goPackagePath = "github.com/go-check/check";
fetch = {
type = "git";
url = "https://github.com/go-check/check";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "v1.0.1";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/go-kit/kit";
fetch = {
@ -153,6 +288,15 @@
sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
};
}
{
goPackagePath = "github.com/go-martini/martini";
fetch = {
type = "git";
url = "https://github.com/go-martini/martini";
rev = "22fa46961aab";
sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
};
}
{
goPackagePath = "github.com/go-stack/stack";
fetch = {
@ -212,8 +356,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.3.1";
sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
rev = "v1.3.2";
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
};
}
{
@ -234,6 +378,15 @@
sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "v1.0.0";
sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
goPackagePath = "github.com/google/renameio";
fetch = {
@ -261,6 +414,15 @@
sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
};
}
{
goPackagePath = "github.com/gorilla/schema";
fetch = {
type = "git";
url = "https://github.com/gorilla/schema";
rev = "v1.1.0";
sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
@ -297,6 +459,51 @@
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
goPackagePath = "github.com/imkira/go-interpol";
fetch = {
type = "git";
url = "https://github.com/imkira/go-interpol";
rev = "v1.1.0";
sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
};
}
{
goPackagePath = "github.com/iris-contrib/blackfriday";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/blackfriday";
rev = "v2.0.0";
sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
};
}
{
goPackagePath = "github.com/iris-contrib/formBinder";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/formBinder";
rev = "v5.0.0";
sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg";
};
}
{
goPackagePath = "github.com/iris-contrib/go.uuid";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/go.uuid";
rev = "v2.0.0";
sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
};
}
{
goPackagePath = "github.com/iris-contrib/httpexpect";
fetch = {
type = "git";
url = "https://github.com/iris-contrib/httpexpect";
rev = "ebe99fcebbce";
sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c";
};
}
{
goPackagePath = "github.com/jfbus/httprs";
fetch = {
@ -333,6 +540,33 @@
sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "089d3ea4e4d5";
sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
};
}
{
goPackagePath = "github.com/juju/loggo";
fetch = {
type = "git";
url = "https://github.com/juju/loggo";
rev = "584905176618";
sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4";
};
}
{
goPackagePath = "github.com/juju/testing";
fetch = {
type = "git";
url = "https://github.com/juju/testing";
rev = "472a3e8b2073";
sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4";
};
}
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
@ -342,6 +576,42 @@
sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
};
}
{
goPackagePath = "github.com/k0kubun/colorstring";
fetch = {
type = "git";
url = "https://github.com/k0kubun/colorstring";
rev = "9440f1994b88";
sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj";
};
}
{
goPackagePath = "github.com/kataras/golog";
fetch = {
type = "git";
url = "https://github.com/kataras/golog";
rev = "99c81de45f40";
sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p";
};
}
{
goPackagePath = "github.com/kataras/iris";
fetch = {
type = "git";
url = "https://github.com/kataras/iris";
rev = "v11.1.1";
sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg";
};
}
{
goPackagePath = "github.com/kataras/pio";
fetch = {
type = "git";
url = "https://github.com/kataras/pio";
rev = "ea782b38602d";
sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj";
};
}
{
goPackagePath = "github.com/kelseyhightower/envconfig";
fetch = {
@ -360,6 +630,24 @@
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
};
}
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
rev = "v1.4.0";
sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
};
}
{
goPackagePath = "github.com/klauspost/cpuid";
fetch = {
type = "git";
url = "https://github.com/klauspost/cpuid";
rev = "e7e905edc00e";
sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
@ -405,6 +693,24 @@
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
goPackagePath = "github.com/labstack/echo";
fetch = {
type = "git";
url = "https://github.com/labstack/echo";
rev = "v4.1.10";
sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h";
};
}
{
goPackagePath = "github.com/labstack/gommon";
fetch = {
type = "git";
url = "https://github.com/labstack/gommon";
rev = "v0.3.0";
sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
};
}
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@ -423,6 +729,33 @@
sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "v0.1.2";
sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.9";
sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
};
}
{
goPackagePath = "github.com/mattn/goveralls";
fetch = {
type = "git";
url = "https://github.com/mattn/goveralls";
rev = "v0.0.2";
sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
@ -432,6 +765,15 @@
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/microcosm-cc/bluemonday";
fetch = {
type = "git";
url = "https://github.com/microcosm-cc/bluemonday";
rev = "v1.0.2";
sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
};
}
{
goPackagePath = "github.com/mitchellh/copystructure";
fetch = {
@ -468,6 +810,15 @@
sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
};
}
{
goPackagePath = "github.com/moul/http2curl";
fetch = {
type = "git";
url = "https://github.com/moul/http2curl";
rev = "v1.0.0";
sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0";
};
}
{
goPackagePath = "github.com/mwitkow/go-conntrack";
fetch = {
@ -482,8 +833,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "v1.7.0";
sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
rev = "v1.10.1";
sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
};
}
{
@ -491,8 +842,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "v1.4.3";
sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
rev = "v1.7.0";
sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
};
}
{
@ -513,13 +864,22 @@
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
{
goPackagePath = "github.com/pingcap/errors";
fetch = {
type = "git";
url = "https://github.com/pingcap/errors";
rev = "v0.11.1";
sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.0";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@ -585,6 +945,15 @@
sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
};
}
{
goPackagePath = "github.com/ryanuber/columnize";
fetch = {
type = "git";
url = "https://github.com/ryanuber/columnize";
rev = "v2.1.0";
sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
};
}
{
goPackagePath = "github.com/sebest/xff";
fetch = {
@ -594,6 +963,24 @@
sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
};
}
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
type = "git";
url = "https://github.com/sergi/go-diff";
rev = "v1.0.0";
sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "v1.0.0";
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
@ -635,8 +1022,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
rev = "v1.4.0";
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
@ -675,13 +1062,130 @@
sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
};
}
{
goPackagePath = "github.com/ugorji/go";
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "v1.1.4";
sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
};
}
{
goPackagePath = "github.com/urfave/negroni";
fetch = {
type = "git";
url = "https://github.com/urfave/negroni";
rev = "v1.0.0";
sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
};
}
{
goPackagePath = "github.com/valyala/bytebufferpool";
fetch = {
type = "git";
url = "https://github.com/valyala/bytebufferpool";
rev = "v1.0.0";
sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
};
}
{
goPackagePath = "github.com/valyala/fasthttp";
fetch = {
type = "git";
url = "https://github.com/valyala/fasthttp";
rev = "v1.4.0";
sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956";
};
}
{
goPackagePath = "github.com/valyala/fasttemplate";
fetch = {
type = "git";
url = "https://github.com/valyala/fasttemplate";
rev = "v1.0.1";
sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
};
}
{
goPackagePath = "github.com/valyala/tcplisten";
fetch = {
type = "git";
url = "https://github.com/valyala/tcplisten";
rev = "ceec8f93295a";
sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonpointer";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonpointer";
rev = "df4f5c81cb3b";
sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonreference";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonreference";
rev = "bd5ef7bd5415";
sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
};
}
{
goPackagePath = "github.com/xeipuuv/gojsonschema";
fetch = {
type = "git";
url = "https://github.com/xeipuuv/gojsonschema";
rev = "v1.1.0";
sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg";
};
}
{
goPackagePath = "github.com/yalp/jsonpath";
fetch = {
type = "git";
url = "https://github.com/yalp/jsonpath";
rev = "5cc68e5049a0";
sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b";
};
}
{
goPackagePath = "github.com/yudai/gojsondiff";
fetch = {
type = "git";
url = "https://github.com/yudai/gojsondiff";
rev = "v1.0.0";
sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2";
};
}
{
goPackagePath = "github.com/yudai/golcs";
fetch = {
type = "git";
url = "https://github.com/yudai/golcs";
rev = "ecda9a501e82";
sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq";
};
}
{
goPackagePath = "github.com/yudai/pp";
fetch = {
type = "git";
url = "https://github.com/yudai/pp";
rev = "v2.0.1";
sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
};
}
{
goPackagePath = "gitlab.com/gitlab-org/gitaly";
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/gitaly.git";
rev = "v1.57.0";
sha256 = "0mgawp5afcv9s4y8fq3mc4dn6hhdg1shbns8vmjwklh9bia988cy";
rev = "v1.74.0";
sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd";
};
}
{
@ -689,8 +1193,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/labkit.git";
rev = "905271af7abb";
sha256 = "144w5dikd82wz53drml9khlx39pmp6kgqccc5c0xfzpijbj7krbd";
rev = "3253d7975ca7";
sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s";
};
}
{
@ -707,8 +1211,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "20be4c3c3ed5";
sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
rev = "4def268fd1a4";
sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
};
}
{
@ -716,8 +1220,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
rev = "06c8688daad7";
sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
rev = "d0100b6bd8b3";
sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
@ -761,8 +1265,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "953cdadca894";
sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
rev = "fde4db37ae7a";
sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
};
}
{
@ -806,8 +1310,8 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "v1.16.0";
sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
rev = "v1.24.0";
sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6";
};
}
{
@ -855,6 +1359,33 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "gopkg.in/go-playground/assert.v1";
fetch = {
type = "git";
url = "https://gopkg.in/go-playground/assert.v1";
rev = "v1.2.1";
sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm";
};
}
{
goPackagePath = "gopkg.in/go-playground/validator.v8";
fetch = {
type = "git";
url = "https://gopkg.in/go-playground/validator.v8";
rev = "v8.18.2";
sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
};
}
{
goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mgo.v2";
rev = "9856a29383ce";
sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
};
}
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {

View file

@ -22,6 +22,7 @@ gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'
gem 'marginalia', '~> 1.8.0'
# Authentication libraries
gem 'devise', '~> 4.6'
@ -101,7 +102,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
gem 'hamlit', '~> 2.8.8'
gem 'hamlit', '~> 2.11.0'
# Files attachments
gem 'carrierwave', '~> 1.3'
@ -135,11 +136,11 @@ gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.2.1'
gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
@ -170,8 +171,8 @@ group :unicorn do
end
group :puma do
gem 'puma', '~> 3.12', require: false
gem 'puma_worker_killer', require: false
gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
gem 'rack-timeout', require: false
end
@ -273,8 +274,8 @@ gem 'mimemagic', '~> 0.3.2'
gem 'fast_blank'
# Parse time & duration
gem 'chronic', '~> 0.10.2'
gem 'gitlab_chronic_duration', '~> 0.10.6.1'
gem 'gitlab-chronic', '~> 0.10.5'
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -312,8 +313,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development
gem 'batch-loader', '~> 1.4.0'
# Perf bar
# https://gitlab.com/gitlab-org/gitlab/issues/13996
gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
gem 'peek', '~> 1.1'
# Snowplow events tracking
gem 'snowplow-tracker', '~> 0.6.1'
@ -347,20 +347,15 @@ group :development do
end
group :development, :test do
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
gem 'awesome_print', require: false
gem 'fuubar', '~> 2.2.0'
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0'
gem 'rspec-rails', '~> 3.8.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
gem 'rspec-rails', '~> 4.0.0.beta3'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
@ -368,10 +363,6 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.10'
gem 'capybara', '~> 3.22.0'
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.141'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
@ -382,7 +373,7 @@ group :development, :test do
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false
gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
@ -390,7 +381,7 @@ group :development, :test do
gem 'knapsack', '~> 1.17'
gem 'stackprof', '~> 0.2.10', require: false
gem 'stackprof', '~> 0.2.13', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false
@ -403,6 +394,16 @@ group :development, :test, :omnibus do
end
group :test do
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.22.0'
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142'
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
@ -416,7 +417,7 @@ end
gem 'octokit', '~> 4.9'
gem 'mail_room', '~> 0.9.1'
gem 'mail_room', '~> 0.10.0'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -451,7 +452,7 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 1.70.0'
gem 'gitaly', '~> 1.73.0'
gem 'grpc', '~> 1.24.0'

View file

@ -118,9 +118,9 @@ GEM
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
bullet (5.5.1)
bullet (6.0.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
uniform_notifier (~> 1.11)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
@ -143,9 +143,7 @@ GEM
cause (0.1)
character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
childprocess (3.0.0)
chunky_png (1.3.5)
citrus (3.0.2)
claide (1.0.3)
@ -157,7 +155,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.17.13)
commonmarker (0.20.1)
ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
@ -287,7 +285,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
ffi (1.11.1)
ffi (1.11.3)
flipper (0.17.1)
flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7)
@ -359,9 +357,11 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
gitaly (1.70.0)
gitaly (1.73.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-labkit (0.7.0)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
@ -372,8 +372,11 @@ GEM
gitlab-license (1.0.0)
gitlab-markup (1.7.0)
gitlab-net-dns (0.9.1)
gitlab-peek (0.0.1)
railties (>= 4.0.0)
gitlab-puma (4.3.1.gitlab.2)
nio4r (~> 2.0)
gitlab-puma_worker_killer (0.1.1.gitlab.1)
get_process_mem (~> 0.2)
gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5)
gitlab-styles (2.8.0)
@ -381,8 +384,8 @@ GEM
rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.1.0)
rubocop-rspec (~> 1.19)
gitlab_chronic_duration (0.10.6.1)
numerizer (~> 0.1.1)
gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2)
gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
@ -460,17 +463,16 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
haml (5.0.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml_lint (0.31.0)
haml (>= 4.0, < 5.1)
haml_lint (0.34.0)
haml (>= 4.0, < 5.2)
rainbow
rake (>= 10, < 13)
rubocop (>= 0.50.0)
sysexits (~> 1.1)
hamlit (2.8.8)
temple (>= 0.8.0)
hamlit (2.11.0)
temple (>= 0.8.2)
thor
tilt
hangouts-chat (0.0.5)
@ -484,7 +486,7 @@ GEM
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.8.4)
html-pipeline (2.12.2)
activesupport (>= 2)
nokogiri (>= 1.4)
html2text (0.2.0)
@ -591,9 +593,12 @@ GEM
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
mail_room (0.10.0)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marginalia (1.8.0)
actionpack (>= 2.3)
activerecord (>= 2.3)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
@ -622,7 +627,7 @@ GEM
net-ntp (2.1.3)
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
@ -631,7 +636,7 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
numerizer (0.1.1)
numerizer (0.2.0)
oauth (0.5.4)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
@ -724,6 +729,8 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
parslet (1.8.2)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
@ -749,10 +756,6 @@ GEM
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.1.1)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
rack (2.0.7)
@ -881,14 +884,14 @@ GEM
proc_to_ast
rspec (>= 2.13, < 4)
unparser
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-rails (4.0.0.beta3)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.8)
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-set (0.1.3)
@ -927,7 +930,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.3.0)
rugged (0.28.3.1)
rugged (0.28.4.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@ -956,9 +959,9 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
@ -1002,7 +1005,7 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sshkey (2.0.0)
stackprof (0.2.10)
stackprof (0.2.13)
state_machines (0.5.0)
state_machines-activemodel (0.7.1)
activemodel (>= 4.1)
@ -1017,7 +1020,7 @@ GEM
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
temple (0.8.1)
temple (0.8.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.10.0)
@ -1026,10 +1029,10 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
thor (0.20.3)
thread_safe (0.3.6)
thrift (0.11.0.0)
tilt (2.0.9)
tilt (2.0.10)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.2.0)
@ -1057,7 +1060,7 @@ GEM
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
uniform_notifier (1.13.0)
unleash (0.1.5)
murmurhash3 (~> 0.1.6)
unparser (0.4.5)
@ -1139,14 +1142,13 @@ DEPENDENCIES
bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
bullet (~> 6.0.2)
bundler-audit (~> 0.5.0)
capybara (~> 3.22.0)
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
commonmarker (~> 0.17)
commonmarker (~> 0.20)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
countries (~> 3.0)
@ -1194,16 +1196,18 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 1.70.0)
gitaly (~> 1.73.0)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-labkit (~> 0.5)
gitlab-license (~> 1.0)
gitlab-markup (~> 1.7.0)
gitlab-net-dns (~> 0.9.1)
gitlab-peek (~> 0.0.1)
gitlab-puma (~> 4.3.1.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 2.7)
gitlab_chronic_duration (~> 0.10.6.1)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
@ -1219,13 +1223,13 @@ DEPENDENCIES
grpc (~> 1.24.0)
gssapi
guard-rspec
haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
haml_lint (~> 0.34.0)
hamlit (~> 2.11.0)
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html-pipeline (~> 2.12)
html2text
httparty (~> 0.16.4)
icalendar
@ -1243,7 +1247,8 @@ DEPENDENCIES
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
mail_room (~> 0.9.1)
mail_room (~> 0.10.0)
marginalia (~> 1.8.0)
memory_profiler (~> 0.9)
method_source (~> 0.8)
mimemagic (~> 0.3.2)
@ -1275,13 +1280,12 @@ DEPENDENCIES
omniauth_crowd (~> 2.2.0)
omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
peek (~> 1.1)
pg (~> 1.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
rack (~> 2.0.7)
rack-attack (~> 6.2.0)
rack-cors (~> 1.0.0)
@ -1307,7 +1311,7 @@ DEPENDENCIES
rouge (~> 3.11.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 3.8.0)
rspec-rails (~> 4.0.0.beta3)
rspec-retry (~> 0.6.1)
rspec-set (~> 0.1.3)
rspec_junit_formatter
@ -1325,7 +1329,7 @@ DEPENDENCIES
sassc-rails (~> 2.1.0)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.141)
selenium-webdriver (~> 3.142)
sentry-raven (~> 2.9)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
@ -1339,7 +1343,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
stackprof (~> 0.2.13)
state_machines-activerecord (~> 0.6.0)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.10.0)

View file

@ -545,10 +545,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5";
sha256 = "1h16vrqblcdlizgbidk7bgmhcfb96a9y5jw117my5yhs07yp0i3s";
type = "gem";
};
version = "5.5.1";
version = "6.0.2";
};
bundler-audit = {
dependencies = ["thor"];
@ -639,25 +639,14 @@
version = "0.7.6";
};
childprocess = {
dependencies = ["ffi"];
groups = ["default" "development" "test"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
type = "gem";
};
version = "0.9.0";
};
chronic = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
type = "gem";
};
version = "0.10.2";
version = "3.0.0";
};
chunky_png = {
groups = ["default"];
@ -741,10 +730,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461";
type = "gem";
};
version = "0.17.13";
version = "0.20.1";
};
concord = {
dependencies = ["adamantium" "equalizer"];
@ -1385,10 +1374,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
type = "gem";
};
version = "1.11.1";
version = "1.11.3";
};
flipper = {
groups = ["default"];
@ -1655,10 +1644,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3";
sha256 = "1bls6aywjkvq1jw324criphzbzl710rx1nab4y22bvyi98qvdi38";
type = "gem";
};
version = "1.70.0";
version = "1.73.0";
};
github-markup = {
groups = ["default"];
@ -1670,6 +1659,17 @@
};
version = "1.7.0";
};
gitlab-chronic = {
dependencies = ["numerizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xf857vj55r1jafbkdpdzq6c22r964rj9186m1q8hw4vd7f1h3zq";
type = "gem";
};
version = "0.10.5";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"];
@ -1711,16 +1711,27 @@
};
version = "0.9.1";
};
gitlab-peek = {
dependencies = ["railties"];
groups = ["default"];
gitlab-puma = {
dependencies = ["nio4r"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql";
sha256 = "0a0kihx7ps6hc1a5xbpbssqnh1k0gzfvln7xkjinpqipvk53l094";
type = "gem";
};
version = "0.0.1";
version = "4.3.1.gitlab.2";
};
gitlab-puma_worker_killer = {
dependencies = ["get_process_mem" "gitlab-puma"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har";
type = "gem";
};
version = "0.1.1.gitlab.1";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@ -1750,10 +1761,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs";
sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd";
type = "gem";
};
version = "0.10.6.1";
version = "0.10.6.2";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@ -1978,21 +1989,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
sha256 = "0dwarfbc04bblljs4xg9fy57b5y8xrck6slhssa6bd7x58bh222c";
type = "gem";
};
version = "5.0.4";
version = "5.1.2";
};
haml_lint = {
dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
dependencies = ["haml" "rainbow" "rubocop" "sysexits"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1";
sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn";
type = "gem";
};
version = "0.31.0";
version = "0.34.0";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@ -2000,10 +2011,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60";
type = "gem";
};
version = "2.8.8";
version = "2.11.0";
};
hangouts-chat = {
groups = ["default"];
@ -2084,10 +2095,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
type = "gem";
};
version = "2.8.4";
version = "2.12.2";
};
html2text = {
dependencies = ["nokogiri"];
@ -2561,10 +2572,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa";
sha256 = "0q06fkv6wka68gbva17jknm57jnjwk57f9ng1lvyvwki2v4jnkz4";
type = "gem";
};
version = "0.9.1";
version = "0.10.0";
};
marcel = {
dependencies = ["mimemagic"];
@ -2577,6 +2588,17 @@
};
version = "0.3.3";
};
marginalia = {
dependencies = ["actionpack" "activerecord"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1akbiibmg64liw8ya6xzf9lavh2n2707hxsnf9sfslsk36iwx0yn";
type = "gem";
};
version = "1.8.0";
};
memoist = {
groups = ["default"];
platforms = [];
@ -2835,14 +2857,14 @@
version = "0.11.0";
};
nio4r = {
groups = ["default" "development" "test"];
groups = ["default" "puma" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
type = "gem";
};
version = "2.3.1";
version = "2.5.2";
};
no_proxy_fix = {
groups = ["default" "development"];
@ -2892,10 +2914,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
sha256 = "0ysxf30qcybh131r98frp38sqqkdhcjwpnajgrxl2w2kxvapd075";
type = "gem";
};
version = "0.1.1";
version = "0.2.0";
};
oauth = {
groups = ["default"];
@ -3263,6 +3285,17 @@
};
version = "1.8.2";
};
peek = {
dependencies = ["railties"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k1yggixrcj72jlc98hi3jjd04x71dpynn8dxpcdhinyijniwl6n";
type = "gem";
};
version = "1.1.0";
};
pg = {
groups = ["default" "development" "test"];
platforms = [];
@ -3388,27 +3421,6 @@
};
version = "3.1.1";
};
puma = {
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
type = "gem";
};
version = "3.12.0";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
groups = ["puma"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
type = "gem";
};
version = "0.1.0";
};
pyu-ruby-sasl = {
groups = ["default"];
platforms = [];
@ -3981,10 +3993,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1";
sha256 = "164dni69b9imgv33rxzsy3272ni10xny0f4dbx6k90zr1cgzmj5s";
type = "gem";
};
version = "3.8.2";
version = "4.0.0.beta3";
};
rspec-retry = {
dependencies = ["rspec-core"];
@ -4192,10 +4204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
type = "gem";
};
version = "0.28.3.1";
version = "0.28.4.1";
};
safe_yaml = {
groups = ["default" "test"];
@ -4297,14 +4309,14 @@
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
groups = ["development" "test"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
type = "gem";
};
version = "3.141.0";
version = "3.142.6";
};
sentry-raven = {
dependencies = ["faraday"];
@ -4522,10 +4534,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
sha256 = "1wck8lqmlndaic2c8z678ylxkkyqlip9ikms9x6lplk298rrdybl";
type = "gem";
};
version = "0.2.10";
version = "0.2.13";
};
state_machines = {
groups = ["default"];
@ -4596,10 +4608,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861";
type = "gem";
};
version = "0.8.1";
version = "0.8.2";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@ -4644,14 +4656,14 @@
version = "1.7.2";
};
thor = {
groups = ["default" "development" "test"];
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
version = "0.19.4";
version = "0.20.3";
};
thread_safe = {
groups = ["default" "development" "test"];
@ -4678,10 +4690,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.9";
version = "2.0.10";
};
timecop = {
groups = ["development" "test"];
@ -4846,10 +4858,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c";
type = "gem";
};
version = "1.10.0";
version = "1.13.0";
};
unleash = {
dependencies = ["murmurhash3"];

View file

@ -195,7 +195,7 @@ def update_gitlab_shell():
for fn in ['go.mod', 'go.sum']:
with open(gitlab_shell_dir / fn, 'w') as f:
f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}"))
f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)

View file

@ -257,6 +257,14 @@
sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
};
}
{
name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz";
path = fetchurl {
name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.5.tgz";
sha1 = "f0835f044cef85b31071a924010a2a390add11d4";
};
}
{
name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz";
path = fetchurl {
@ -321,6 +329,14 @@
sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
};
}
{
name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz";
path = fetchurl {
name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz";
sha1 = "c91fdde6de85d2eb8906daea7b21944c3610c901";
};
}
{
name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
path = fetchurl {
@ -626,11 +642,11 @@
};
}
{
name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
path = fetchurl {
name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz";
sha1 = "1fd247d6ab477d53d4c330e05f007e3afa303689";
name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-2.0.0.tgz";
sha1 = "e30dbf2b170a7a4ca003a321de9f4170a2512510";
};
}
{
@ -650,35 +666,35 @@
};
}
{
name = "_gitlab_svgs___svgs_1.82.0.tgz";
name = "_gitlab_svgs___svgs_1.88.0.tgz";
path = fetchurl {
name = "_gitlab_svgs___svgs_1.82.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz";
sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80";
name = "_gitlab_svgs___svgs_1.88.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.88.0.tgz";
sha1 = "0a9b72e9591264fcac592ebf9944665c70f48de2";
};
}
{
name = "_gitlab_ui___ui_7.11.0.tgz";
name = "_gitlab_ui___ui_8.8.0.tgz";
path = fetchurl {
name = "_gitlab_ui___ui_7.11.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz";
sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b";
name = "_gitlab_ui___ui_8.8.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.8.0.tgz";
sha1 = "c22b4dece89d224c525b3510970f3c61321a6765";
};
}
{
name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz";
path = fetchurl {
name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz";
sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a";
name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.5.1.tgz";
sha1 = "2552927cd7a376f1f06ef3293a69fe2ffcdddb52";
};
}
{
name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
path = fetchurl {
name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz";
url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.2.1.tgz";
sha1 = "f407b5aa710863e5b7f021f4a1f66160331ab263";
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.3.0.tgz";
sha1 = "f21550d4ce406ee5f99447a02abf36250ecc922d";
};
}
{
@ -786,59 +802,59 @@
};
}
{
name = "_sentry_browser___browser_5.7.1.tgz";
name = "_sentry_browser___browser_5.10.2.tgz";
path = fetchurl {
name = "_sentry_browser___browser_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz";
sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4";
name = "_sentry_browser___browser_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.10.2.tgz";
sha1 = "0bbb05505c58ea998c833cffec3f922fe4b4fa58";
};
}
{
name = "_sentry_core___core_5.7.1.tgz";
name = "_sentry_core___core_5.10.2.tgz";
path = fetchurl {
name = "_sentry_core___core_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz";
sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e";
name = "_sentry_core___core_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.10.2.tgz";
sha1 = "1cb64489e6f8363c3249415b49d3f1289814825f";
};
}
{
name = "_sentry_hub___hub_5.7.1.tgz";
name = "_sentry_hub___hub_5.10.2.tgz";
path = fetchurl {
name = "_sentry_hub___hub_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz";
sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad";
name = "_sentry_hub___hub_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.10.2.tgz";
sha1 = "25d9f36b8f7c5cb65cf486737fa61dc9bf69b7e3";
};
}
{
name = "_sentry_minimal___minimal_5.7.1.tgz";
name = "_sentry_minimal___minimal_5.10.2.tgz";
path = fetchurl {
name = "_sentry_minimal___minimal_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz";
sha1 = "56afc537737586929e25349765e37a367958c1e1";
name = "_sentry_minimal___minimal_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.10.2.tgz";
sha1 = "267c2f3aa6877a0fe7a86971942e83f3ee616580";
};
}
{
name = "_sentry_types___types_5.7.1.tgz";
name = "_sentry_types___types_5.10.0.tgz";
path = fetchurl {
name = "_sentry_types___types_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz";
sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090";
name = "_sentry_types___types_5.10.0.tgz";
url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.10.0.tgz";
sha1 = "4f0ba31b6e4d5371112c38279f11f66c73b43746";
};
}
{
name = "_sentry_utils___utils_5.7.1.tgz";
name = "_sentry_utils___utils_5.10.2.tgz";
path = fetchurl {
name = "_sentry_utils___utils_5.7.1.tgz";
url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz";
sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0";
name = "_sentry_utils___utils_5.10.2.tgz";
url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.10.2.tgz";
sha1 = "261f575079d30aaf604e59f5f4de0aa21db22252";
};
}
{
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz";
path = fetchurl {
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz";
sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596";
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz";
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.14.tgz";
sha1 = "e12b08371dc37bf4a468450b008c6e167705e1a8";
};
}
{
@ -921,14 +937,6 @@
sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
};
}
{
name = "_types_jquery___jquery_2.0.48.tgz";
path = fetchurl {
name = "_types_jquery___jquery_2.0.48.tgz";
url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz";
sha1 = "3e90d8cde2d29015e5583017f7830cb3975b2eef";
};
}
{
name = "_types_minimatch___minimatch_3.0.3.tgz";
path = fetchurl {
@ -1601,6 +1609,14 @@
sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
};
}
{
name = "array_includes___array_includes_3.0.3.tgz";
path = fetchurl {
name = "array_includes___array_includes_3.0.3.tgz";
url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz";
sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d";
};
}
{
name = "array_union___array_union_1.0.2.tgz";
path = fetchurl {
@ -4322,19 +4338,19 @@
};
}
{
name = "es_abstract___es_abstract_1.13.0.tgz";
name = "es_abstract___es_abstract_1.16.2.tgz";
path = fetchurl {
name = "es_abstract___es_abstract_1.13.0.tgz";
url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz";
sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
name = "es_abstract___es_abstract_1.16.2.tgz";
url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz";
sha1 = "4e874331645e9925edef141e74fc4bd144669d34";
};
}
{
name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
path = fetchurl {
name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
};
}
{
@ -4418,11 +4434,11 @@
};
}
{
name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
path = fetchurl {
name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz";
sha1 = "546178dab5e046c8b562bbb50705e2456d7bda49";
name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz";
sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c";
};
}
{
@ -4434,11 +4450,11 @@
};
}
{
name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
path = fetchurl {
name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz";
sha1 = "97ac3e75d0791c4fac0e15ef388510217be7f66f";
name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz";
sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6";
};
}
{
@ -4458,11 +4474,11 @@
};
}
{
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz";
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
path = fetchurl {
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.1.0.tgz";
sha1 = "d03b74224c5cfbc7fc0bdd12ce4eb400d09e0c0b";
name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.0.tgz";
sha1 = "fccdad84afa61baa4c0527dd6249cdcbfa0f74a8";
};
}
{
@ -5602,11 +5618,11 @@
};
}
{
name = "has_symbols___has_symbols_1.0.0.tgz";
name = "has_symbols___has_symbols_1.0.1.tgz";
path = fetchurl {
name = "has_symbols___has_symbols_1.0.0.tgz";
url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz";
sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
name = "has_symbols___has_symbols_1.0.1.tgz";
url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz";
sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8";
};
}
{
@ -8617,6 +8633,14 @@
sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
};
}
{
name = "object_inspect___object_inspect_1.7.0.tgz";
path = fetchurl {
name = "object_inspect___object_inspect_1.7.0.tgz";
url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
};
}
{
name = "object_keys___object_keys_1.1.1.tgz";
path = fetchurl {
@ -8665,6 +8689,14 @@
sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
};
}
{
name = "object.values___object.values_1.1.0.tgz";
path = fetchurl {
name = "object.values___object.values_1.1.0.tgz";
url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz";
sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9";
};
}
{
name = "obuf___obuf_1.1.2.tgz";
path = fetchurl {
@ -10402,11 +10434,11 @@
};
}
{
name = "resolve___resolve_1.11.1.tgz";
name = "resolve___resolve_1.12.0.tgz";
path = fetchurl {
name = "resolve___resolve_1.11.1.tgz";
url = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz";
sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e";
name = "resolve___resolve_1.12.0.tgz";
url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
};
}
{
@ -11265,6 +11297,22 @@
sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
};
}
{
name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
path = fetchurl {
name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634";
};
}
{
name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
path = fetchurl {
name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
};
}
{
name = "string_decoder___string_decoder_1.1.1.tgz";
path = fetchurl {
@ -11457,6 +11505,14 @@
sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d";
};
}
{
name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz";
path = fetchurl {
name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz";
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.24.3.tgz";
sha1 = "99754d11b0ddd314a1a50db850acb415e4b0a0c6";
};
}
{
name = "symbol_observable___symbol_observable_1.2.0.tgz";
path = fetchurl {
@ -11634,11 +11690,11 @@
};
}
{
name = "timeago.js___timeago.js_3.0.2.tgz";
name = "timeago.js___timeago.js_4.0.1.tgz";
path = fetchurl {
name = "timeago.js___timeago.js_3.0.2.tgz";
url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz";
sha1 = "32a67e7c0d887ea42ca588d3aae26f77de5e76cc";
name = "timeago.js___timeago.js_4.0.1.tgz";
url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.1.tgz";
sha1 = "4be4aa19565ceaeb0da31fe14e01ce6ca4742da6";
};
}
{