gitlab: 9.5.2 -> 9.5.5
This commit is contained in:
parent
e5b97e36c5
commit
e2822f6384
@ -555,6 +555,7 @@ in {
|
|||||||
openssh
|
openssh
|
||||||
nodejs
|
nodejs
|
||||||
procps
|
procps
|
||||||
|
gnupg
|
||||||
];
|
];
|
||||||
preStart = ''
|
preStart = ''
|
||||||
mkdir -p ${cfg.backupPath}
|
mkdir -p ${cfg.backupPath}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||||
gem 'gitaly', '~> 0.30.0'
|
gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly'
|
||||||
gem 'activesupport'
|
gem 'activesupport'
|
||||||
|
@ -13,7 +13,7 @@ GEM
|
|||||||
escape_utils (1.1.1)
|
escape_utils (1.1.1)
|
||||||
faraday (0.12.2)
|
faraday (0.12.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
gitaly (0.30.0)
|
gitaly-proto (0.31.0)
|
||||||
google-protobuf (~> 3.1)
|
google-protobuf (~> 3.1)
|
||||||
grpc (~> 1.0)
|
grpc (~> 1.0)
|
||||||
github-linguist (4.7.6)
|
github-linguist (4.7.6)
|
||||||
@ -30,7 +30,7 @@ GEM
|
|||||||
multi_json (~> 1.11)
|
multi_json (~> 1.11)
|
||||||
os (~> 0.9)
|
os (~> 0.9)
|
||||||
signet (~> 0.7)
|
signet (~> 0.7)
|
||||||
grpc (1.4.1)
|
grpc (1.4.5)
|
||||||
google-protobuf (~> 3.1)
|
google-protobuf (~> 3.1)
|
||||||
googleauth (~> 0.5.1)
|
googleauth (~> 0.5.1)
|
||||||
i18n (0.8.1)
|
i18n (0.8.1)
|
||||||
@ -63,7 +63,7 @@ PLATFORMS
|
|||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
activesupport
|
activesupport
|
||||||
gitaly (~> 0.30.0)
|
gitaly-proto (~> 0.31.0)
|
||||||
github-linguist (~> 4.7.0)
|
github-linguist (~> 4.7.0)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
|
@ -7,14 +7,14 @@ let
|
|||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
};
|
};
|
||||||
in buildGoPackage rec {
|
in buildGoPackage rec {
|
||||||
version = "0.33.0";
|
version = "0.35.0";
|
||||||
name = "gitaly-${version}";
|
name = "gitaly-${version}";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1x23z3a0svychs1kc9cbiskl0dp7ji9ddzqr6md22jiy6vgwx2wa";
|
sha256 = "0h3gh4y571wrnnsg5wpi67psih8yssaw24v3vrcpqpkz5linj7pl";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "gitlab.com/gitlab-org/gitaly";
|
goPackagePath = "gitlab.com/gitlab-org/gitaly";
|
||||||
|
@ -50,14 +50,14 @@
|
|||||||
};
|
};
|
||||||
version = "0.12.2";
|
version = "0.12.2";
|
||||||
};
|
};
|
||||||
gitaly = {
|
gitaly-proto = {
|
||||||
dependencies = ["google-protobuf" "grpc"];
|
dependencies = ["google-protobuf" "grpc"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "16ya0vqmrr3nsrsrcph1rqnb43gpvszhvs8v6viki5lvg9rdxb67";
|
sha256 = "1n5bpclizxc42m5kbrhdgsb0ddkl47d0rgmcya5b6sv8qbclkkds";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.30.0";
|
version = "0.31.0";
|
||||||
};
|
};
|
||||||
github-linguist = {
|
github-linguist = {
|
||||||
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
|
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
|
||||||
@ -89,10 +89,10 @@
|
|||||||
dependencies = ["google-protobuf" "googleauth"];
|
dependencies = ["google-protobuf" "googleauth"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0hp8sfvl99imzp3c5sp96qpi49550v7ri7ljfvb3nllcmd3jw7sk";
|
sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.4.1";
|
version = "1.4.5";
|
||||||
};
|
};
|
||||||
i18n = {
|
i18n = {
|
||||||
source = {
|
source = {
|
||||||
|
@ -27,7 +27,7 @@ gem 'doorkeeper-openid_connect', '~> 1.1.0'
|
|||||||
gem 'omniauth', '~> 1.4.2'
|
gem 'omniauth', '~> 1.4.2'
|
||||||
gem 'omniauth-auth0', '~> 1.4.1'
|
gem 'omniauth-auth0', '~> 1.4.1'
|
||||||
gem 'omniauth-azure-oauth2', '~> 0.0.6'
|
gem 'omniauth-azure-oauth2', '~> 0.0.6'
|
||||||
gem 'omniauth-cas3', '~> 1.1.2'
|
gem 'omniauth-cas3', '~> 1.1.4'
|
||||||
gem 'omniauth-facebook', '~> 4.0.0'
|
gem 'omniauth-facebook', '~> 4.0.0'
|
||||||
gem 'omniauth-github', '~> 1.1.1'
|
gem 'omniauth-github', '~> 1.1.1'
|
||||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||||
@ -126,12 +126,9 @@ gem 'wikicloth', '0.8.1'
|
|||||||
gem 'asciidoctor', '~> 1.5.2'
|
gem 'asciidoctor', '~> 1.5.2'
|
||||||
gem 'asciidoctor-plantuml', '0.0.7'
|
gem 'asciidoctor-plantuml', '0.0.7'
|
||||||
gem 'rouge', '~> 2.0'
|
gem 'rouge', '~> 2.0'
|
||||||
gem 'truncato', '~> 0.7.8'
|
gem 'truncato', '~> 0.7.9'
|
||||||
gem 'bootstrap_form', '~> 2.7.0'
|
gem 'bootstrap_form', '~> 2.7.0'
|
||||||
|
gem 'nokogiri', '~> 1.8.0'
|
||||||
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
|
|
||||||
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
|
|
||||||
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
|
|
||||||
|
|
||||||
# Diffs
|
# Diffs
|
||||||
gem 'diffy', '~> 3.1.0'
|
gem 'diffy', '~> 3.1.0'
|
||||||
@ -250,7 +247,7 @@ gem 'uglifier', '~> 2.7.2'
|
|||||||
gem 'addressable', '~> 2.3.8'
|
gem 'addressable', '~> 2.3.8'
|
||||||
gem 'bootstrap-sass', '~> 3.3.0'
|
gem 'bootstrap-sass', '~> 3.3.0'
|
||||||
gem 'font-awesome-rails', '~> 4.7'
|
gem 'font-awesome-rails', '~> 4.7'
|
||||||
gem 'gemojione', '~> 3.0'
|
gem 'gemojione', '~> 3.3'
|
||||||
gem 'gon', '~> 6.1.0'
|
gem 'gon', '~> 6.1.0'
|
||||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||||
gem 'jquery-rails', '~> 4.1.0'
|
gem 'jquery-rails', '~> 4.1.0'
|
||||||
@ -289,7 +286,7 @@ group :metrics do
|
|||||||
gem 'influxdb', '~> 0.2', require: false
|
gem 'influxdb', '~> 0.2', require: false
|
||||||
|
|
||||||
# Prometheus
|
# Prometheus
|
||||||
gem 'prometheus-client-mmap', '~>0.7.0.beta11'
|
gem 'prometheus-client-mmap', '~>0.7.0.beta14'
|
||||||
gem 'raindrops', '~> 0.18'
|
gem 'raindrops', '~> 0.18'
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -324,6 +321,7 @@ group :development, :test do
|
|||||||
gem 'spinach-rerun-reporter', '~> 0.0.2'
|
gem 'spinach-rerun-reporter', '~> 0.0.2'
|
||||||
gem 'rspec_profiling', '~> 0.0.5'
|
gem 'rspec_profiling', '~> 0.0.5'
|
||||||
gem 'rspec-set', '~> 0.1.3'
|
gem 'rspec-set', '~> 0.1.3'
|
||||||
|
gem 'rspec-parameterized'
|
||||||
|
|
||||||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||||
gem 'minitest', '~> 5.7.0'
|
gem 'minitest', '~> 5.7.0'
|
||||||
|
@ -2,6 +2,7 @@ GEM
|
|||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
RedCloth (4.3.2)
|
RedCloth (4.3.2)
|
||||||
|
abstract_type (0.0.7)
|
||||||
ace-rails-ap (4.1.2)
|
ace-rails-ap (4.1.2)
|
||||||
actionmailer (4.2.8)
|
actionmailer (4.2.8)
|
||||||
actionpack (= 4.2.8)
|
actionpack (= 4.2.8)
|
||||||
@ -43,6 +44,9 @@ GEM
|
|||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
acts-as-taggable-on (4.0.0)
|
acts-as-taggable-on (4.0.0)
|
||||||
activerecord (>= 4.0)
|
activerecord (>= 4.0)
|
||||||
|
adamantium (0.2.0)
|
||||||
|
ice_nine (~> 0.11.0)
|
||||||
|
memoizable (~> 0.4.0)
|
||||||
addressable (2.3.8)
|
addressable (2.3.8)
|
||||||
after_commit_queue (1.3.0)
|
after_commit_queue (1.3.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
@ -126,6 +130,9 @@ GEM
|
|||||||
coercible (1.0.0)
|
coercible (1.0.0)
|
||||||
descendants_tracker (~> 0.0.1)
|
descendants_tracker (~> 0.0.1)
|
||||||
colorize (0.7.7)
|
colorize (0.7.7)
|
||||||
|
concord (0.1.5)
|
||||||
|
adamantium (~> 0.2.0)
|
||||||
|
equalizer (~> 0.0.9)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
concurrent-ruby-ext (1.0.5)
|
concurrent-ruby-ext (1.0.5)
|
||||||
concurrent-ruby (= 1.0.5)
|
concurrent-ruby (= 1.0.5)
|
||||||
@ -258,7 +265,7 @@ GEM
|
|||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
gemnasium-gitlab-service (0.2.6)
|
gemnasium-gitlab-service (0.2.6)
|
||||||
rugged (~> 0.21)
|
rugged (~> 0.21)
|
||||||
gemojione (3.0.1)
|
gemojione (3.3.0)
|
||||||
json
|
json
|
||||||
get_process_mem (0.2.0)
|
get_process_mem (0.2.0)
|
||||||
gettext (3.2.2)
|
gettext (3.2.2)
|
||||||
@ -280,7 +287,7 @@ GEM
|
|||||||
escape_utils (~> 1.1.0)
|
escape_utils (~> 1.1.0)
|
||||||
mime-types (>= 1.19)
|
mime-types (>= 1.19)
|
||||||
rugged (>= 0.23.0b)
|
rugged (>= 0.23.0b)
|
||||||
github-markup (1.4.0)
|
github-markup (1.6.1)
|
||||||
gitlab-flowdock-git-hook (1.0.1)
|
gitlab-flowdock-git-hook (1.0.1)
|
||||||
flowdock (~> 0.7)
|
flowdock (~> 0.7)
|
||||||
gitlab-grit (>= 2.4.1)
|
gitlab-grit (>= 2.4.1)
|
||||||
@ -300,13 +307,14 @@ GEM
|
|||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
gollum-grit_adapter (1.0.1)
|
gollum-grit_adapter (1.0.1)
|
||||||
gitlab-grit (~> 2.7, >= 2.7.1)
|
gitlab-grit (~> 2.7, >= 2.7.1)
|
||||||
gollum-lib (4.2.1)
|
gollum-lib (4.2.7)
|
||||||
github-markup (~> 1.4.0)
|
gemojione (~> 3.2)
|
||||||
|
github-markup (~> 1.6)
|
||||||
gollum-grit_adapter (~> 1.0)
|
gollum-grit_adapter (~> 1.0)
|
||||||
nokogiri (~> 1.6.4)
|
nokogiri (>= 1.6.1, < 2.0)
|
||||||
rouge (~> 2.0)
|
rouge (~> 2.1)
|
||||||
sanitize (~> 2.1.0)
|
sanitize (~> 2.1)
|
||||||
stringex (~> 2.5.1)
|
stringex (~> 2.6)
|
||||||
gollum-rugged_adapter (0.4.4)
|
gollum-rugged_adapter (0.4.4)
|
||||||
mime-types (>= 1.15)
|
mime-types (>= 1.15)
|
||||||
rugged (~> 0.25)
|
rugged (~> 0.25)
|
||||||
@ -468,14 +476,16 @@ GEM
|
|||||||
railties (>= 4, < 5.2)
|
railties (>= 4, < 5.2)
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.6.5)
|
mail (2.6.6)
|
||||||
mime-types (>= 1.16, < 4)
|
mime-types (>= 1.16, < 4)
|
||||||
mail_room (0.9.1)
|
mail_room (0.9.1)
|
||||||
memoist (0.15.0)
|
memoist (0.15.0)
|
||||||
|
memoizable (0.4.2)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.99.3)
|
mime-types (2.99.3)
|
||||||
mimemagic (0.3.0)
|
mimemagic (0.3.0)
|
||||||
mini_portile2 (2.1.0)
|
mini_portile2 (2.2.0)
|
||||||
minitest (5.7.0)
|
minitest (5.7.0)
|
||||||
mmap2 (2.2.7)
|
mmap2 (2.2.7)
|
||||||
mousetrap-rails (1.4.6)
|
mousetrap-rails (1.4.6)
|
||||||
@ -489,8 +499,8 @@ GEM
|
|||||||
net-ldap (0.16.0)
|
net-ldap (0.16.0)
|
||||||
net-ssh (4.1.0)
|
net-ssh (4.1.0)
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nokogiri (1.6.8.1)
|
nokogiri (1.8.0)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.2.0)
|
||||||
numerizer (0.1.1)
|
numerizer (0.1.1)
|
||||||
oauth (0.5.1)
|
oauth (0.5.1)
|
||||||
oauth2 (1.4.0)
|
oauth2 (1.4.0)
|
||||||
@ -513,9 +523,9 @@ GEM
|
|||||||
jwt (~> 1.0)
|
jwt (~> 1.0)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.1)
|
||||||
omniauth-cas3 (1.1.3)
|
omniauth-cas3 (1.1.4)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
nokogiri (~> 1.6.6)
|
nokogiri (~> 1.7, >= 1.7.1)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
omniauth-facebook (4.0.0)
|
omniauth-facebook (4.0.0)
|
||||||
omniauth-oauth2 (~> 1.2)
|
omniauth-oauth2 (~> 1.2)
|
||||||
@ -603,7 +613,7 @@ GEM
|
|||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
websocket-driver (>= 0.2.0)
|
websocket-driver (>= 0.2.0)
|
||||||
posix-spawn (0.3.11)
|
posix-spawn (0.3.13)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
premailer (1.10.4)
|
premailer (1.10.4)
|
||||||
addressable
|
addressable
|
||||||
@ -612,7 +622,12 @@ GEM
|
|||||||
premailer-rails (1.9.7)
|
premailer-rails (1.9.7)
|
||||||
actionmailer (>= 3, < 6)
|
actionmailer (>= 3, < 6)
|
||||||
premailer (~> 1.7, >= 1.7.9)
|
premailer (~> 1.7, >= 1.7.9)
|
||||||
prometheus-client-mmap (0.7.0.beta11)
|
proc_to_ast (0.1.0)
|
||||||
|
coderay
|
||||||
|
parser
|
||||||
|
unparser
|
||||||
|
procto (0.0.3)
|
||||||
|
prometheus-client-mmap (0.7.0.beta14)
|
||||||
mmap2 (~> 2.2, >= 2.2.7)
|
mmap2 (~> 2.2, >= 2.2.7)
|
||||||
pry (0.10.4)
|
pry (0.10.4)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
@ -720,6 +735,10 @@ GEM
|
|||||||
chunky_png
|
chunky_png
|
||||||
rqrcode-rails3 (0.1.7)
|
rqrcode-rails3 (0.1.7)
|
||||||
rqrcode (>= 0.4.2)
|
rqrcode (>= 0.4.2)
|
||||||
|
rspec (3.6.0)
|
||||||
|
rspec-core (~> 3.6.0)
|
||||||
|
rspec-expectations (~> 3.6.0)
|
||||||
|
rspec-mocks (~> 3.6.0)
|
||||||
rspec-core (3.6.0)
|
rspec-core (3.6.0)
|
||||||
rspec-support (~> 3.6.0)
|
rspec-support (~> 3.6.0)
|
||||||
rspec-expectations (3.6.0)
|
rspec-expectations (3.6.0)
|
||||||
@ -728,6 +747,12 @@ GEM
|
|||||||
rspec-mocks (3.6.0)
|
rspec-mocks (3.6.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.6.0)
|
rspec-support (~> 3.6.0)
|
||||||
|
rspec-parameterized (0.4.0)
|
||||||
|
binding_of_caller
|
||||||
|
parser
|
||||||
|
proc_to_ast
|
||||||
|
rspec (>= 2.13, < 4)
|
||||||
|
unparser
|
||||||
rspec-rails (3.6.0)
|
rspec-rails (3.6.0)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
@ -852,7 +877,7 @@ GEM
|
|||||||
state_machines-activerecord (0.4.0)
|
state_machines-activerecord (0.4.0)
|
||||||
activerecord (>= 4.1, < 5.1)
|
activerecord (>= 4.1, < 5.1)
|
||||||
state_machines-activemodel (>= 0.3.0)
|
state_machines-activemodel (>= 0.3.0)
|
||||||
stringex (2.5.2)
|
stringex (2.7.1)
|
||||||
sys-filesystem (1.1.6)
|
sys-filesystem (1.1.6)
|
||||||
ffi
|
ffi
|
||||||
sysexits (1.2.0)
|
sysexits (1.2.0)
|
||||||
@ -871,9 +896,9 @@ GEM
|
|||||||
timfel-krb5-auth (0.8.3)
|
timfel-krb5-auth (0.8.3)
|
||||||
toml-rb (0.3.15)
|
toml-rb (0.3.15)
|
||||||
citrus (~> 3.0, > 3.0)
|
citrus (~> 3.0, > 3.0)
|
||||||
truncato (0.7.8)
|
truncato (0.7.10)
|
||||||
htmlentities (~> 4.3.1)
|
htmlentities (~> 4.3.1)
|
||||||
nokogiri (~> 1.6.1)
|
nokogiri (~> 1.8.0, >= 1.7.0)
|
||||||
tzinfo (1.2.3)
|
tzinfo (1.2.3)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
u2f (0.2.1)
|
u2f (0.2.1)
|
||||||
@ -892,6 +917,14 @@ GEM
|
|||||||
get_process_mem (~> 0)
|
get_process_mem (~> 0)
|
||||||
unicorn (>= 4, < 6)
|
unicorn (>= 4, < 6)
|
||||||
uniform_notifier (1.10.0)
|
uniform_notifier (1.10.0)
|
||||||
|
unparser (0.2.6)
|
||||||
|
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.5)
|
||||||
|
procto (~> 0.0.2)
|
||||||
url_safe_base64 (0.2.2)
|
url_safe_base64 (0.2.2)
|
||||||
validates_hostname (1.0.6)
|
validates_hostname (1.0.6)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
@ -990,7 +1023,7 @@ DEPENDENCIES
|
|||||||
foreman (~> 0.78.0)
|
foreman (~> 0.78.0)
|
||||||
fuubar (~> 2.2.0)
|
fuubar (~> 2.2.0)
|
||||||
gemnasium-gitlab-service (~> 0.2)
|
gemnasium-gitlab-service (~> 0.2)
|
||||||
gemojione (~> 3.0)
|
gemojione (~> 3.3)
|
||||||
gettext (~> 3.2.2)
|
gettext (~> 3.2.2)
|
||||||
gettext_i18n_rails (~> 1.8.0)
|
gettext_i18n_rails (~> 1.8.0)
|
||||||
gettext_i18n_rails_js (~> 1.2.0)
|
gettext_i18n_rails_js (~> 1.2.0)
|
||||||
@ -1036,7 +1069,7 @@ DEPENDENCIES
|
|||||||
mysql2 (~> 0.4.5)
|
mysql2 (~> 0.4.5)
|
||||||
net-ldap
|
net-ldap
|
||||||
net-ssh (~> 4.1.0)
|
net-ssh (~> 4.1.0)
|
||||||
nokogiri (~> 1.6.7, >= 1.6.7.2)
|
nokogiri (~> 1.8.0)
|
||||||
oauth2 (~> 1.4)
|
oauth2 (~> 1.4)
|
||||||
octokit (~> 4.6.2)
|
octokit (~> 4.6.2)
|
||||||
oj (~> 2.17.4)
|
oj (~> 2.17.4)
|
||||||
@ -1044,7 +1077,7 @@ DEPENDENCIES
|
|||||||
omniauth-auth0 (~> 1.4.1)
|
omniauth-auth0 (~> 1.4.1)
|
||||||
omniauth-authentiq (~> 0.3.1)
|
omniauth-authentiq (~> 0.3.1)
|
||||||
omniauth-azure-oauth2 (~> 0.0.6)
|
omniauth-azure-oauth2 (~> 0.0.6)
|
||||||
omniauth-cas3 (~> 1.1.2)
|
omniauth-cas3 (~> 1.1.4)
|
||||||
omniauth-facebook (~> 4.0.0)
|
omniauth-facebook (~> 4.0.0)
|
||||||
omniauth-github (~> 1.1.1)
|
omniauth-github (~> 1.1.1)
|
||||||
omniauth-gitlab (~> 1.0.2)
|
omniauth-gitlab (~> 1.0.2)
|
||||||
@ -1069,7 +1102,7 @@ DEPENDENCIES
|
|||||||
pg (~> 0.18.2)
|
pg (~> 0.18.2)
|
||||||
poltergeist (~> 1.9.0)
|
poltergeist (~> 1.9.0)
|
||||||
premailer-rails (~> 1.9.7)
|
premailer-rails (~> 1.9.7)
|
||||||
prometheus-client-mmap (~> 0.7.0.beta11)
|
prometheus-client-mmap (~> 0.7.0.beta14)
|
||||||
pry-byebug (~> 3.4.1)
|
pry-byebug (~> 3.4.1)
|
||||||
pry-rails (~> 0.3.4)
|
pry-rails (~> 0.3.4)
|
||||||
rack-attack (~> 4.4.1)
|
rack-attack (~> 4.4.1)
|
||||||
@ -1095,6 +1128,7 @@ DEPENDENCIES
|
|||||||
responders (~> 2.0)
|
responders (~> 2.0)
|
||||||
rouge (~> 2.0)
|
rouge (~> 2.0)
|
||||||
rqrcode-rails3 (~> 0.1.7)
|
rqrcode-rails3 (~> 0.1.7)
|
||||||
|
rspec-parameterized
|
||||||
rspec-rails (~> 3.6.0)
|
rspec-rails (~> 3.6.0)
|
||||||
rspec-retry (~> 0.4.5)
|
rspec-retry (~> 0.4.5)
|
||||||
rspec-set (~> 0.1.3)
|
rspec-set (~> 0.1.3)
|
||||||
@ -1133,7 +1167,7 @@ DEPENDENCIES
|
|||||||
thin (~> 1.7.0)
|
thin (~> 1.7.0)
|
||||||
timecop (~> 0.8.0)
|
timecop (~> 0.8.0)
|
||||||
toml-rb (~> 0.3.15)
|
toml-rb (~> 0.3.15)
|
||||||
truncato (~> 0.7.8)
|
truncato (~> 0.7.9)
|
||||||
u2f (~> 0.2.1)
|
u2f (~> 0.2.1)
|
||||||
uglifier (~> 2.7.2)
|
uglifier (~> 2.7.2)
|
||||||
underscore-rails (~> 1.8.0)
|
underscore-rails (~> 1.8.0)
|
||||||
|
@ -18,11 +18,11 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "9.5.2";
|
version = "9.5.5";
|
||||||
|
|
||||||
gitlabDeb = fetchurl {
|
gitlabDeb = fetchurl {
|
||||||
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
|
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
|
||||||
sha256 = "0h0cmhs1bz5248vqxq5x3grggw2x53n6kbinlsyhnvcyds0vk0pa";
|
sha256 = "1wrwxksfqkha7qm2hbgs0z7lmgisdvdqa4wcll0qfzq1c3d286zz";
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||||||
owner = "gitlabhq";
|
owner = "gitlabhq";
|
||||||
repo = "gitlabhq";
|
repo = "gitlabhq";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0ljqimdzxw5pvif2jrzjdihypa30595nb02h12a4gw3wz3qrrxdc";
|
sha256 = "0qi21lkq69ah977vssbkllb7q5jwb0vf2ws5s3bzpvp2mj3iab5m";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -1,4 +1,12 @@
|
|||||||
{
|
{
|
||||||
|
abstract_type = {
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.0.7";
|
||||||
|
};
|
||||||
ace-rails-ap = {
|
ace-rails-ap = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
@ -97,6 +105,15 @@
|
|||||||
};
|
};
|
||||||
version = "4.0.0";
|
version = "4.0.0";
|
||||||
};
|
};
|
||||||
|
adamantium = {
|
||||||
|
dependencies = ["ice_nine" "memoizable"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.2.0";
|
||||||
|
};
|
||||||
addressable = {
|
addressable = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
@ -474,6 +491,15 @@
|
|||||||
};
|
};
|
||||||
version = "0.7.7";
|
version = "0.7.7";
|
||||||
};
|
};
|
||||||
|
concord = {
|
||||||
|
dependencies = ["adamantium" "equalizer"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.1.5";
|
||||||
|
};
|
||||||
concurrent-ruby = {
|
concurrent-ruby = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
@ -1002,10 +1028,10 @@
|
|||||||
dependencies = ["json"];
|
dependencies = ["json"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "17yy3cp7b75ngc2v4f0cacvq3f1bk3il5a0ykvnypl6fcj6r6b3w";
|
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.0.1";
|
version = "3.3.0";
|
||||||
};
|
};
|
||||||
get_process_mem = {
|
get_process_mem = {
|
||||||
source = {
|
source = {
|
||||||
@ -1071,10 +1097,10 @@
|
|||||||
github-markup = {
|
github-markup = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "046bvnbhk3bw021sd88808n71dya0b0dmx8hm64rj0fvs2jzg54z";
|
sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.4.0";
|
version = "1.6.1";
|
||||||
};
|
};
|
||||||
gitlab-flowdock-git-hook = {
|
gitlab-flowdock-git-hook = {
|
||||||
dependencies = ["flowdock" "gitlab-grit" "multi_json"];
|
dependencies = ["flowdock" "gitlab-grit" "multi_json"];
|
||||||
@ -1130,13 +1156,13 @@
|
|||||||
version = "1.0.1";
|
version = "1.0.1";
|
||||||
};
|
};
|
||||||
gollum-lib = {
|
gollum-lib = {
|
||||||
dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
|
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1q668c76gnyyyl8217gnblbj50plm7giacs5lgf7ix2rj8rdxzj7";
|
sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "4.2.1";
|
version = "4.2.7";
|
||||||
};
|
};
|
||||||
gollum-rugged_adapter = {
|
gollum-rugged_adapter = {
|
||||||
dependencies = ["mime-types" "rugged"];
|
dependencies = ["mime-types" "rugged"];
|
||||||
@ -1620,10 +1646,10 @@
|
|||||||
dependencies = ["mime-types"];
|
dependencies = ["mime-types"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "07k8swmv7vgk86clzpjhdlmgahlvg6yzjwy7wcsv0xx400fh4x61";
|
sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.6.5";
|
version = "2.6.6";
|
||||||
};
|
};
|
||||||
mail_room = {
|
mail_room = {
|
||||||
source = {
|
source = {
|
||||||
@ -1641,6 +1667,15 @@
|
|||||||
};
|
};
|
||||||
version = "0.15.0";
|
version = "0.15.0";
|
||||||
};
|
};
|
||||||
|
memoizable = {
|
||||||
|
dependencies = ["thread_safe"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.4.2";
|
||||||
|
};
|
||||||
method_source = {
|
method_source = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
@ -1668,10 +1703,10 @@
|
|||||||
mini_portile2 = {
|
mini_portile2 = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
|
sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.1.0";
|
version = "2.2.0";
|
||||||
};
|
};
|
||||||
minitest = {
|
minitest = {
|
||||||
source = {
|
source = {
|
||||||
@ -1774,10 +1809,10 @@
|
|||||||
dependencies = ["mini_portile2"];
|
dependencies = ["mini_portile2"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj";
|
sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.6.8.1";
|
version = "1.8.0";
|
||||||
};
|
};
|
||||||
numerizer = {
|
numerizer = {
|
||||||
source = {
|
source = {
|
||||||
@ -1861,10 +1896,10 @@
|
|||||||
dependencies = ["addressable" "nokogiri" "omniauth"];
|
dependencies = ["addressable" "nokogiri" "omniauth"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7";
|
sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.1.3";
|
version = "1.1.4";
|
||||||
};
|
};
|
||||||
omniauth-facebook = {
|
omniauth-facebook = {
|
||||||
dependencies = ["omniauth-oauth2"];
|
dependencies = ["omniauth-oauth2"];
|
||||||
@ -2152,10 +2187,10 @@
|
|||||||
posix-spawn = {
|
posix-spawn = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
|
sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.3.11";
|
version = "0.3.13";
|
||||||
};
|
};
|
||||||
powerpack = {
|
powerpack = {
|
||||||
source = {
|
source = {
|
||||||
@ -2183,14 +2218,31 @@
|
|||||||
};
|
};
|
||||||
version = "1.9.7";
|
version = "1.9.7";
|
||||||
};
|
};
|
||||||
|
proc_to_ast = {
|
||||||
|
dependencies = ["coderay" "parser" "unparser"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.1.0";
|
||||||
|
};
|
||||||
|
procto = {
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.0.3";
|
||||||
|
};
|
||||||
prometheus-client-mmap = {
|
prometheus-client-mmap = {
|
||||||
dependencies = ["mmap2"];
|
dependencies = ["mmap2"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "13y2rg2bzbpdx33d72j4dwgwcnml4y7gv0pg401642kmv3ypab77";
|
sha256 = "1r9s30hypcpw4abxlzcjlkcwkckqvr5sbph3blbl0rq2r8c8h25p";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.7.0.beta11";
|
version = "0.7.0.beta14";
|
||||||
};
|
};
|
||||||
pry = {
|
pry = {
|
||||||
dependencies = ["coderay" "method_source" "slop"];
|
dependencies = ["coderay" "method_source" "slop"];
|
||||||
@ -2591,6 +2643,15 @@
|
|||||||
};
|
};
|
||||||
version = "0.1.7";
|
version = "0.1.7";
|
||||||
};
|
};
|
||||||
|
rspec = {
|
||||||
|
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.6.0";
|
||||||
|
};
|
||||||
rspec-core = {
|
rspec-core = {
|
||||||
dependencies = ["rspec-support"];
|
dependencies = ["rspec-support"];
|
||||||
source = {
|
source = {
|
||||||
@ -2618,6 +2679,15 @@
|
|||||||
};
|
};
|
||||||
version = "3.6.0";
|
version = "3.6.0";
|
||||||
};
|
};
|
||||||
|
rspec-parameterized = {
|
||||||
|
dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.4.0";
|
||||||
|
};
|
||||||
rspec-rails = {
|
rspec-rails = {
|
||||||
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
|
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
|
||||||
source = {
|
source = {
|
||||||
@ -3070,10 +3140,10 @@
|
|||||||
stringex = {
|
stringex = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
|
sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.5.2";
|
version = "2.7.1";
|
||||||
};
|
};
|
||||||
sys-filesystem = {
|
sys-filesystem = {
|
||||||
dependencies = ["ffi"];
|
dependencies = ["ffi"];
|
||||||
@ -3179,10 +3249,10 @@
|
|||||||
dependencies = ["htmlentities" "nokogiri"];
|
dependencies = ["htmlentities" "nokogiri"];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5";
|
sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.7.8";
|
version = "0.7.10";
|
||||||
};
|
};
|
||||||
tzinfo = {
|
tzinfo = {
|
||||||
dependencies = ["thread_safe"];
|
dependencies = ["thread_safe"];
|
||||||
@ -3269,6 +3339,15 @@
|
|||||||
};
|
};
|
||||||
version = "1.10.0";
|
version = "1.10.0";
|
||||||
};
|
};
|
||||||
|
unparser = {
|
||||||
|
dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1jhpgvghn764myi5iwlys98f71yspwgrzimzz11108jnhl5rcx7l";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "0.2.6";
|
||||||
|
};
|
||||||
url_safe_base64 = {
|
url_safe_base64 = {
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
|
Loading…
Reference in New Issue
Block a user