- gitlab-shell no longer requires ruby for anything else than the install script, so the bundlerEnv stuff could be dropped - gitlab-shell and gitlab-workhorse now report their versions correctlywip/yesman
talyz
5 years ago
committed by
Emery Hemingway
parent
e79bc59532
commit
5081a6cd56
@ -1,13 +1,13 @@ |
||||
{ |
||||
"version": "12.3.5", |
||||
"repo_hash": "12ywspgnbwm232vmzbqhkqmwmcrb9pvihsayzmw0cxvhlfwq6995", |
||||
"version": "12.4.0", |
||||
"repo_hash": "0z2jykjv9sa4akq2qd4bl5ngqk3gpy2xfhxmcbd4d61w6l2jw00f", |
||||
"owner": "gitlab-org", |
||||
"repo": "gitlab", |
||||
"rev": "v12.3.5-ee", |
||||
"rev": "v12.4.0-ee", |
||||
"passthru": { |
||||
"GITALY_SERVER_VERSION": "1.65.1", |
||||
"GITLAB_PAGES_VERSION": "1.9.0", |
||||
"GITLAB_SHELL_VERSION": "10.0.0", |
||||
"GITLAB_WORKHORSE_VERSION": "8.10.0" |
||||
"GITALY_SERVER_VERSION": "1.67.0", |
||||
"GITLAB_PAGES_VERSION": "1.11.0", |
||||
"GITLAB_SHELL_VERSION": "10.2.0", |
||||
"GITLAB_WORKHORSE_VERSION": "8.14.0" |
||||
} |
||||
} |
||||
@ -1,12 +0,0 @@ |
||||
source 'https://rubygems.org' |
||||
|
||||
group :development, :test do |
||||
gem 'listen', '~> 0.5.0' |
||||
gem 'pry', '~> 0.12.2' |
||||
gem 'rspec', '~> 3.8.0' |
||||
gem 'rspec-parameterized', '~> 0.4.0' |
||||
gem 'rubocop', '0.49.1', require: false |
||||
gem 'simplecov', '~> 0.9.0', require: false |
||||
gem 'vcr', '~> 4.0.0' |
||||
gem 'webmock', '~> 3.4.0' |
||||
end |
||||
@ -1,109 +0,0 @@ |
||||
GEM |
||||
remote: https://rubygems.org/ |
||||
specs: |
||||
abstract_type (0.0.7) |
||||
adamantium (0.2.0) |
||||
ice_nine (~> 0.11.0) |
||||
memoizable (~> 0.4.0) |
||||
addressable (2.5.2) |
||||
public_suffix (>= 2.0.2, < 4.0) |
||||
ast (2.4.0) |
||||
binding_of_caller (0.8.0) |
||||
debug_inspector (>= 0.0.1) |
||||
coderay (1.1.2) |
||||
concord (0.1.5) |
||||
adamantium (~> 0.2.0) |
||||
equalizer (~> 0.0.9) |
||||
crack (0.4.3) |
||||
safe_yaml (~> 1.0.0) |
||||
debug_inspector (0.0.3) |
||||
diff-lcs (1.3) |
||||
docile (1.1.5) |
||||
equalizer (0.0.11) |
||||
hashdiff (0.3.7) |
||||
ice_nine (0.11.2) |
||||
listen (0.5.3) |
||||
memoizable (0.4.2) |
||||
thread_safe (~> 0.3, >= 0.3.1) |
||||
method_source (0.9.2) |
||||
multi_json (1.13.1) |
||||
parallel (1.12.1) |
||||
parser (2.5.1.2) |
||||
ast (~> 2.4.0) |
||||
powerpack (0.1.2) |
||||
proc_to_ast (0.1.0) |
||||
coderay |
||||
parser |
||||
unparser |
||||
procto (0.0.3) |
||||
pry (0.12.2) |
||||
coderay (~> 1.1.0) |
||||
method_source (~> 0.9.0) |
||||
public_suffix (3.0.3) |
||||
rainbow (2.2.2) |
||||
rake |
||||
rake (12.3.3) |
||||
rspec (3.8.0) |
||||
rspec-core (~> 3.8.0) |
||||
rspec-expectations (~> 3.8.0) |
||||
rspec-mocks (~> 3.8.0) |
||||
rspec-core (3.8.0) |
||||
rspec-support (~> 3.8.0) |
||||
rspec-expectations (3.8.1) |
||||
diff-lcs (>= 1.2.0, < 2.0) |
||||
rspec-support (~> 3.8.0) |
||||
rspec-mocks (3.8.0) |
||||
diff-lcs (>= 1.2.0, < 2.0) |
||||
rspec-support (~> 3.8.0) |
||||
rspec-parameterized (0.4.0) |
||||
binding_of_caller |
||||
parser |
||||
proc_to_ast |
||||
rspec (>= 2.13, < 4) |
||||
unparser |
||||
rspec-support (3.8.0) |
||||
rubocop (0.49.1) |
||||
parallel (~> 1.10) |
||||
parser (>= 2.3.3.1, < 3.0) |
||||
powerpack (~> 0.1) |
||||
rainbow (>= 1.99.1, < 3.0) |
||||
ruby-progressbar (~> 1.7) |
||||
unicode-display_width (~> 1.0, >= 1.0.1) |
||||
ruby-progressbar (1.9.0) |
||||
safe_yaml (1.0.4) |
||||
simplecov (0.9.2) |
||||
docile (~> 1.1.0) |
||||
multi_json (~> 1.0) |
||||
simplecov-html (~> 0.9.0) |
||||
simplecov-html (0.9.0) |
||||
thread_safe (0.3.6) |
||||
unicode-display_width (1.4.0) |
||||
unparser (0.2.8) |
||||
abstract_type (~> 0.0.7) |
||||
adamantium (~> 0.2.0) |
||||
concord (~> 0.1.5) |
||||
diff-lcs (~> 1.3) |
||||
equalizer (~> 0.0.9) |
||||
parser (>= 2.3.1.2, < 2.6) |
||||
procto (~> 0.0.2) |
||||
vcr (4.0.0) |
||||
webmock (3.4.2) |
||||
addressable (>= 2.3.6) |
||||
crack (>= 0.3.2) |
||||
hashdiff |
||||
|
||||
PLATFORMS |
||||
ruby |
||||
|
||||
DEPENDENCIES |
||||
listen (~> 0.5.0) |
||||
pry (~> 0.12.2) |
||||
rspec (~> 3.8.0) |
||||
rspec-parameterized (~> 0.4.0) |
||||
rubocop (= 0.49.1) |
||||
simplecov (~> 0.9.0) |
||||
vcr (~> 4.0.0) |
||||
webmock (~> 3.4.0) |
||||
|
||||
BUNDLED WITH |
||||
1.16.3 |
||||
@ -1,451 +0,0 @@ |
||||
{ |
||||
abstract_type = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.0.7"; |
||||
}; |
||||
adamantium = { |
||||
dependencies = ["ice_nine" "memoizable"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.2.0"; |
||||
}; |
||||
addressable = { |
||||
dependencies = ["public_suffix"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.5.2"; |
||||
}; |
||||
ast = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.4.0"; |
||||
}; |
||||
binding_of_caller = { |
||||
dependencies = ["debug_inspector"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.8.0"; |
||||
}; |
||||
coderay = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.1.2"; |
||||
}; |
||||
concord = { |
||||
dependencies = ["adamantium" "equalizer"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.1.5"; |
||||
}; |
||||
crack = { |
||||
dependencies = ["safe_yaml"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.4.3"; |
||||
}; |
||||
debug_inspector = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.0.3"; |
||||
}; |
||||
diff-lcs = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.3"; |
||||
}; |
||||
docile = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.1.5"; |
||||
}; |
||||
equalizer = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.0.11"; |
||||
}; |
||||
hashdiff = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.3.7"; |
||||
}; |
||||
ice_nine = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.11.2"; |
||||
}; |
||||
listen = { |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.5.3"; |
||||
}; |
||||
memoizable = { |
||||
dependencies = ["thread_safe"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.4.2"; |
||||
}; |
||||
method_source = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.9.2"; |
||||
}; |
||||
multi_json = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.13.1"; |
||||
}; |
||||
parallel = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.12.1"; |
||||
}; |
||||
parser = { |
||||
dependencies = ["ast"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.5.1.2"; |
||||
}; |
||||
powerpack = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.1.2"; |
||||
}; |
||||
proc_to_ast = { |
||||
dependencies = ["coderay" "parser" "unparser"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.1.0"; |
||||
}; |
||||
procto = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.0.3"; |
||||
}; |
||||
pry = { |
||||
dependencies = ["coderay" "method_source"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.12.2"; |
||||
}; |
||||
public_suffix = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.0.3"; |
||||
}; |
||||
rainbow = { |
||||
dependencies = ["rake"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.2.2"; |
||||
}; |
||||
rake = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; |
||||
type = "gem"; |
||||
}; |
||||
version = "12.3.3"; |
||||
}; |
||||
rspec = { |
||||
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.8.0"; |
||||
}; |
||||
rspec-core = { |
||||
dependencies = ["rspec-support"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.8.0"; |
||||
}; |
||||
rspec-expectations = { |
||||
dependencies = ["diff-lcs" "rspec-support"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0vfqqcjmhdq25jrc8rd7nx4n8xid7s1ynv65ph06bk2xafn3rgll"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.8.1"; |
||||
}; |
||||
rspec-mocks = { |
||||
dependencies = ["diff-lcs" "rspec-support"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.8.0"; |
||||
}; |
||||
rspec-parameterized = { |
||||
dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.4.0"; |
||||
}; |
||||
rspec-support = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.8.0"; |
||||
}; |
||||
rubocop = { |
||||
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.49.1"; |
||||
}; |
||||
ruby-progressbar = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.9.0"; |
||||
}; |
||||
safe_yaml = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.0.4"; |
||||
}; |
||||
simplecov = { |
||||
dependencies = ["docile" "multi_json" "simplecov-html"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.9.2"; |
||||
}; |
||||
simplecov-html = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.9.0"; |
||||
}; |
||||
thread_safe = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.3.6"; |
||||
}; |
||||
unicode-display_width = { |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.4.0"; |
||||
}; |
||||
unparser = { |
||||
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; |
||||
groups = ["default" "development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z"; |
||||
type = "gem"; |
||||
}; |
||||
version = "0.2.8"; |
||||
}; |
||||
vcr = { |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; |
||||
type = "gem"; |
||||
}; |
||||
version = "4.0.0"; |
||||
}; |
||||
webmock = { |
||||
dependencies = ["addressable" "crack" "hashdiff"]; |
||||
groups = ["development" "test"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.4.2"; |
||||
}; |
||||
} |
||||
@ -1,42 +0,0 @@ |
||||
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
|
||||
index f951fe6..b422fe3 100644
|
||||
--- a/go/internal/config/config.go
|
||||
+++ b/go/internal/config/config.go
|
||||
@@ -3,7 +3,6 @@ package config
|
||||
import (
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
- "os"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
@@ -44,16 +43,13 @@ type Config struct {
|
||||
}
|
||||
|
||||
func New() (*Config, error) {
|
||||
- dir, err := os.Getwd()
|
||||
- if err != nil {
|
||||
- return nil, err
|
||||
- }
|
||||
+ dir := "/run/gitlab"
|
||||
|
||||
return NewFromDir(dir)
|
||||
}
|
||||
|
||||
func NewFromDir(dir string) (*Config, error) {
|
||||
- return newFromFile(path.Join(dir, configFile))
|
||||
+ return newFromFile("/run/gitlab/shell-config.yml")
|
||||
}
|
||||
|
||||
func (c *Config) FeatureEnabled(featureName string) bool {
|
||||
diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go
|
||||
index 2cb76a8..f59ad5e 100644
|
||||
--- a/go/internal/command/fallback/fallback.go
|
||||
+++ b/go/internal/command/fallback/fallback.go
|
||||
@@ -53,5 +53,5 @@
|
||||
func (c *Command) fallbackProgram() string {
|
||||
fileName := fmt.Sprintf("%s-ruby", c.Executable.Name)
|
||||
|
||||
- return filepath.Join(c.RootDir, "bin", fileName)
|
||||
+ return filepath.Join("/run/current-system/sw/bin", fileName)
|
||||
}
|
||||
@ -1,27 +0,0 @@ |
||||
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
|
||||
index 0600a18..c46f2d7 100644
|
||||
--- a/lib/gitlab_keys.rb
|
||||
+++ b/lib/gitlab_keys.rb
|
||||
@@ -2,7 +2,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
|
||||
attr_accessor :auth_file, :key
|
||||
|
||||
def self.command(whatever)
|
||||
- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
|
||||
+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
|
||||
end
|
||||
|
||||
def self.command_key(key_id)
|
||||
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
|
||||
index 2cb76a8..f59ad5e 100644
|
||||
--- a/lib/gitlab_shell.rb
|
||||
+++ b/lib/gitlab_shell.rb
|
||||
@@ -195,7 +195,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
|
||||
|
||||
args = [executable, gitaly_address, json_args]
|
||||
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
|
||||
- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
|
||||
+ # Except we don't, because we're already in the right directory on nixos!
|
||||
+ Kernel.exec(env, *args, unsetenv_others: true)
|
||||
end
|
||||
|
||||
def api
|
||||
@ -0,0 +1,57 @@ |
||||
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
|
||||
index 2231851..c869930 100644
|
||||
--- a/go/internal/config/config.go
|
||||
+++ b/go/internal/config/config.go
|
||||
@@ -3,7 +3,6 @@ package config
|
||||
import (
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
- "os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
|
||||
@@ -38,16 +37,13 @@ type Config struct {
|
||||
}
|
||||
|
||||
func New() (*Config, error) {
|
||||
- dir, err := os.Getwd()
|
||||
- if err != nil {
|
||||
- return nil, err
|
||||
- }
|
||||
+ dir := "/run/gitlab"
|
||||
|
||||
return NewFromDir(dir)
|
||||
}
|
||||
|
||||
func NewFromDir(dir string) (*Config, error) {
|
||||
- return newFromFile(path.Join(dir, configFile))
|
||||
+ return newFromFile("/run/gitlab/shell-config.yml")
|
||||
}
|
||||
|
||||
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
|
||||
@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
|
||||
}
|
||||
|
||||
func (k *KeyLine) ToString() string {
|
||||
- command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
|
||||
+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id)
|
||||
|
||||
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
|
||||
--- a/support/gitlab_config.rb
|
||||
+++ b/support/gitlab_config.rb
|
||||
@@ -4,7 +4,7 @@ class GitlabConfig
|
||||
attr_reader :config
|
||||
|
||||
def initialize
|
||||
- @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml'))
|
||||
+ @config = YAML.load_file('/run/gitlab/shell-config.yml')
|
||||
end
|
||||
|
||||
def auth_file
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue