gitlab: 9.5.5 -> 10.0.2
This commit is contained in:
Robin Gloster
parent
bb005d138e
commit
57ed9e7e1d
@ -635,6 +635,13 @@ in {
|
||||
chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
|
||||
chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
|
||||
chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
|
||||
chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
|
||||
chmod -R ug-s ${cfg.statePath}/repositories
|
||||
find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s
|
||||
chmod 700 ${cfg.statePath}/uploads
|
||||
chown -R git ${cfg.statePath}/uploads
|
||||
find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \;
|
||||
find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0700 {} \;
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||
gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly'
|
||||
gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
|
||||
gem 'activesupport'
|
||||
|
||||
@ -13,7 +13,7 @@ GEM
|
||||
escape_utils (1.1.1)
|
||||
faraday (0.12.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
gitaly-proto (0.31.0)
|
||||
gitaly-proto (0.37.0)
|
||||
google-protobuf (~> 3.1)
|
||||
grpc (~> 1.0)
|
||||
github-linguist (4.7.6)
|
||||
@ -21,7 +21,7 @@ GEM
|
||||
escape_utils (~> 1.1.0)
|
||||
mime-types (>= 1.19)
|
||||
rugged (>= 0.23.0b)
|
||||
google-protobuf (3.3.0)
|
||||
google-protobuf (3.4.0.2)
|
||||
googleauth (0.5.3)
|
||||
faraday (~> 0.12)
|
||||
jwt (~> 1.4)
|
||||
@ -30,7 +30,7 @@ GEM
|
||||
multi_json (~> 1.11)
|
||||
os (~> 0.9)
|
||||
signet (~> 0.7)
|
||||
grpc (1.4.5)
|
||||
grpc (1.6.0)
|
||||
google-protobuf (~> 3.1)
|
||||
googleauth (~> 0.5.1)
|
||||
i18n (0.8.1)
|
||||
@ -63,8 +63,8 @@ PLATFORMS
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport
|
||||
gitaly-proto (~> 0.31.0)
|
||||
gitaly-proto (~> 0.37.0)
|
||||
github-linguist (~> 4.7.0)
|
||||
|
||||
BUNDLED WITH
|
||||
1.15.3
|
||||
1.15.4
|
||||
|
||||
@ -7,14 +7,14 @@ let
|
||||
gemdir = ./.;
|
||||
};
|
||||
in buildGoPackage rec {
|
||||
version = "0.35.0";
|
||||
version = "0.38.0";
|
||||
name = "gitaly-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h3gh4y571wrnnsg5wpi67psih8yssaw24v3vrcpqpkz5linj7pl";
|
||||
sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf";
|
||||
};
|
||||
|
||||
goPackagePath = "gitlab.com/gitlab-org/gitaly";
|
||||
|
||||
@ -54,10 +54,10 @@
|
||||
dependencies = ["google-protobuf" "grpc"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n5bpclizxc42m5kbrhdgsb0ddkl47d0rgmcya5b6sv8qbclkkds";
|
||||
sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.31.0";
|
||||
version = "0.37.0";
|
||||
};
|
||||
github-linguist = {
|
||||
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
|
||||
@ -71,10 +71,10 @@
|
||||
google-protobuf = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p";
|
||||
sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0";
|
||||
version = "3.4.0.2";
|
||||
};
|
||||
googleauth = {
|
||||
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
|
||||
@ -89,10 +89,10 @@
|
||||
dependencies = ["google-protobuf" "googleauth"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
|
||||
sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.5";
|
||||
version = "1.6.0";
|
||||
};
|
||||
i18n = {
|
||||
source = {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.8.0";
|
||||
version = "5.9.0";
|
||||
name = "gitlab-shell-${version}";
|
||||
|
||||
srcs = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zqd7lys309ylbg45vm1apyx9r82kq1drwinr3di2ybb64v3z2q8";
|
||||
sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@ gem 'mysql2', '~> 0.4.5', group: :mysql
|
||||
gem 'pg', '~> 0.18.2', group: :postgres
|
||||
|
||||
gem 'rugged', '~> 0.26.0'
|
||||
gem 'grape-route-helpers', '~> 2.0.0'
|
||||
gem 'grape-route-helpers', '~> 2.1.0'
|
||||
|
||||
gem 'faraday', '~> 0.12'
|
||||
|
||||
@ -31,7 +31,7 @@ gem 'omniauth-cas3', '~> 1.1.4'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
gem 'omniauth-github', '~> 1.1.1'
|
||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||
gem 'omniauth-google-oauth2', '~> 0.4.1'
|
||||
gem 'omniauth-google-oauth2', '~> 0.5.2'
|
||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||
gem 'omniauth-saml', '~> 1.7.0'
|
||||
@ -64,7 +64,7 @@ gem 'gpgme'
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||
gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
|
||||
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
|
||||
gem 'net-ldap'
|
||||
|
||||
# Git Wiki
|
||||
@ -76,7 +76,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
|
||||
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||
|
||||
# API
|
||||
gem 'grape', '~> 0.19.2'
|
||||
gem 'grape', '~> 1.0'
|
||||
gem 'grape-entity', '~> 0.6.0'
|
||||
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
|
||||
|
||||
@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
|
||||
gem 'rouge', '~> 2.0'
|
||||
gem 'truncato', '~> 0.7.9'
|
||||
gem 'bootstrap_form', '~> 2.7.0'
|
||||
gem 'nokogiri', '~> 1.8.0'
|
||||
gem 'nokogiri', '~> 1.8.1'
|
||||
|
||||
# Diffs
|
||||
gem 'diffy', '~> 3.1.0'
|
||||
@ -141,8 +141,6 @@ end
|
||||
|
||||
# State machine
|
||||
gem 'state_machines-activerecord', '~> 0.4.0'
|
||||
# Run events after state machine commits
|
||||
gem 'after_commit_queue', '~> 1.3.0'
|
||||
|
||||
# Issue tags
|
||||
gem 'acts-as-taggable-on', '~> 4.0'
|
||||
@ -183,7 +181,7 @@ gem 'connection_pool', '~> 2.0'
|
||||
gem 'hipchat', '~> 1.5.0'
|
||||
|
||||
# JIRA integration
|
||||
gem 'jira-ruby', '~> 1.1.2'
|
||||
gem 'jira-ruby', '~> 1.4'
|
||||
|
||||
# Flowdock integration
|
||||
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
|
||||
@ -206,9 +204,6 @@ gem 'kubeclient', '~> 2.2.0'
|
||||
# d3
|
||||
gem 'd3_rails', '~> 3.5.0'
|
||||
|
||||
# underscore-rails
|
||||
gem 'underscore-rails', '~> 1.8.0'
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 2.0'
|
||||
gem 'babosa', '~> 1.0.2'
|
||||
@ -229,7 +224,7 @@ gem 'ace-rails-ap', '~> 4.1.0'
|
||||
gem 'mousetrap-rails', '~> 1.4.6'
|
||||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.3'
|
||||
gem 'charlock_holmes', '~> 0.7.5'
|
||||
|
||||
# Faster JSON
|
||||
gem 'oj', '~> 2.17.4'
|
||||
@ -329,7 +324,7 @@ group :development, :test do
|
||||
# Generate Fake data
|
||||
gem 'ffaker', '~> 2.4'
|
||||
|
||||
gem 'capybara', '~> 2.6.2'
|
||||
gem 'capybara', '~> 2.15.0'
|
||||
gem 'capybara-screenshot', '~> 1.0.0'
|
||||
gem 'poltergeist', '~> 1.9.0'
|
||||
|
||||
@ -339,6 +334,7 @@ group :development, :test do
|
||||
|
||||
gem 'rubocop', '~> 0.49.1', require: false
|
||||
gem 'rubocop-rspec', '~> 1.15.1', require: false
|
||||
gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
|
||||
gem 'scss_lint', '~> 0.54.0', require: false
|
||||
gem 'haml_lint', '~> 0.26.0', require: false
|
||||
gem 'simplecov', '~> 0.14.0', require: false
|
||||
@ -352,7 +348,9 @@ group :development, :test do
|
||||
|
||||
gem 'activerecord_sane_schema_dumper', '0.2'
|
||||
|
||||
gem 'stackprof', '~> 0.2.10'
|
||||
gem 'stackprof', '~> 0.2.10', require: false
|
||||
|
||||
gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||
end
|
||||
|
||||
group :test do
|
||||
@ -394,12 +392,12 @@ gem 'net-ssh', '~> 4.1.0'
|
||||
# Required for ED25519 SSH host key support
|
||||
group :ed25519 do
|
||||
gem 'rbnacl-libsodium'
|
||||
gem 'rbnacl', '~> 3.2'
|
||||
gem 'rbnacl', '~> 4.0'
|
||||
gem 'bcrypt_pbkdf', '~> 1.0'
|
||||
end
|
||||
|
||||
# Gitaly GRPC client
|
||||
gem 'gitaly', '~> 0.26.0'
|
||||
gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
|
||||
|
||||
gem 'toml-rb', '~> 0.3.15', require: false
|
||||
|
||||
@ -409,5 +407,6 @@ gem 'flipper-active_record', '~> 0.10.2'
|
||||
|
||||
# Structured logging
|
||||
gem 'lograge', '~> 0.5'
|
||||
gem 'grape_logging', '~> 1.7'
|
||||
|
||||
gem 'activerecord-nulldb-adapter'
|
||||
|
||||
@ -48,8 +48,6 @@ GEM
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.3.8)
|
||||
after_commit_queue (1.3.0)
|
||||
activerecord (>= 3.0)
|
||||
akismet (2.0.0)
|
||||
allocations (1.0.5)
|
||||
arel (6.0.4)
|
||||
@ -104,9 +102,9 @@ GEM
|
||||
bundler (~> 1.2)
|
||||
thor (~> 0.18)
|
||||
byebug (9.0.6)
|
||||
capybara (2.6.2)
|
||||
capybara (2.15.1)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
@ -119,7 +117,7 @@ GEM
|
||||
activesupport (>= 4.0.0)
|
||||
mime-types (>= 1.16)
|
||||
cause (0.1)
|
||||
charlock_holmes (0.7.3)
|
||||
charlock_holmes (0.7.5)
|
||||
chronic (0.10.2)
|
||||
chronic_duration (0.10.6)
|
||||
numerizer (~> 0.1.1)
|
||||
@ -207,7 +205,7 @@ GEM
|
||||
multi_json
|
||||
fast_gettext (1.4.0)
|
||||
ffaker (2.4.0)
|
||||
ffi (1.9.10)
|
||||
ffi (1.9.18)
|
||||
flay (2.8.1)
|
||||
erubis (~> 2.7.0)
|
||||
path_expander (~> 1.0)
|
||||
@ -279,7 +277,7 @@ GEM
|
||||
po_to_json (>= 1.0.0)
|
||||
rails (>= 3.2.0)
|
||||
gherkin-ruby (0.3.2)
|
||||
gitaly (0.26.0)
|
||||
gitaly-proto (0.33.0)
|
||||
google-protobuf (~> 3.1)
|
||||
grpc (~> 1.0)
|
||||
github-linguist (4.7.6)
|
||||
@ -298,7 +296,7 @@ GEM
|
||||
mime-types (>= 1.16, < 3)
|
||||
posix-spawn (~> 0.3)
|
||||
gitlab-markup (1.5.1)
|
||||
gitlab_omniauth-ldap (2.0.3)
|
||||
gitlab_omniauth-ldap (2.0.4)
|
||||
net-ldap (~> 0.16)
|
||||
omniauth (~> 1.3)
|
||||
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
|
||||
@ -334,7 +332,7 @@ GEM
|
||||
multi_json (~> 1.10)
|
||||
retriable (~> 1.4)
|
||||
signet (~> 0.6)
|
||||
google-protobuf (3.3.0)
|
||||
google-protobuf (3.4.0.2)
|
||||
googleauth (0.5.1)
|
||||
faraday (~> 0.9)
|
||||
jwt (~> 1.4)
|
||||
@ -345,12 +343,9 @@ GEM
|
||||
signet (~> 0.7)
|
||||
gpgme (2.0.13)
|
||||
mini_portile2 (~> 2.1)
|
||||
grape (0.19.2)
|
||||
grape (1.0.0)
|
||||
activesupport
|
||||
builder
|
||||
hashie (>= 2.1.0)
|
||||
multi_json (>= 1.3.2)
|
||||
multi_xml (>= 0.5.2)
|
||||
mustermann-grape (~> 1.0.0)
|
||||
rack (>= 1.3.0)
|
||||
rack-accept
|
||||
@ -358,11 +353,13 @@ GEM
|
||||
grape-entity (0.6.0)
|
||||
activesupport
|
||||
multi_json (>= 1.3.2)
|
||||
grape-route-helpers (2.0.0)
|
||||
grape-route-helpers (2.1.0)
|
||||
activesupport
|
||||
grape (~> 0.16, >= 0.16.0)
|
||||
grape (>= 0.16.0)
|
||||
rake
|
||||
grpc (1.4.0)
|
||||
grape_logging (1.7.0)
|
||||
grape
|
||||
grpc (1.4.5)
|
||||
google-protobuf (~> 3.1)
|
||||
googleauth (~> 0.5.1)
|
||||
haml (4.0.7)
|
||||
@ -378,7 +375,7 @@ GEM
|
||||
thor
|
||||
tilt
|
||||
hashdiff (0.3.4)
|
||||
hashie (3.5.5)
|
||||
hashie (3.5.6)
|
||||
hashie-forbidden_attributes (0.1.1)
|
||||
hashie (>= 3.0)
|
||||
health_check (2.6.0)
|
||||
@ -411,8 +408,9 @@ GEM
|
||||
cause
|
||||
json
|
||||
ipaddress (0.8.3)
|
||||
jira-ruby (1.1.2)
|
||||
jira-ruby (1.4.1)
|
||||
activesupport
|
||||
multipart-post
|
||||
oauth (~> 0.5, >= 0.5.0)
|
||||
jquery-atwho-rails (1.3.2)
|
||||
jquery-rails (4.1.1)
|
||||
@ -485,7 +483,8 @@ GEM
|
||||
method_source (0.8.2)
|
||||
mime-types (2.99.3)
|
||||
mimemagic (0.3.0)
|
||||
mini_portile2 (2.2.0)
|
||||
mini_mime (0.1.4)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.7.0)
|
||||
mmap2 (2.2.7)
|
||||
mousetrap-rails (1.4.6)
|
||||
@ -499,8 +498,8 @@ GEM
|
||||
net-ldap (0.16.0)
|
||||
net-ssh (4.1.0)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.8.0)
|
||||
mini_portile2 (~> 2.2.0)
|
||||
nokogiri (1.8.1)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
numerizer (0.1.1)
|
||||
oauth (0.5.1)
|
||||
oauth2 (1.4.0)
|
||||
@ -535,8 +534,8 @@ GEM
|
||||
omniauth-gitlab (1.0.2)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
omniauth-google-oauth2 (0.4.1)
|
||||
jwt (~> 1.5.2)
|
||||
omniauth-google-oauth2 (0.5.2)
|
||||
jwt (~> 1.5)
|
||||
multi_json (~> 1.3)
|
||||
omniauth (>= 1.1.1)
|
||||
omniauth-oauth2 (>= 1.3.1)
|
||||
@ -569,7 +568,7 @@ GEM
|
||||
rubypants (~> 0.2)
|
||||
orm_adapter (0.5.0)
|
||||
os (0.9.6)
|
||||
parallel (1.11.2)
|
||||
parallel (1.12.0)
|
||||
paranoia (2.3.1)
|
||||
activerecord (>= 4.0, < 5.2)
|
||||
parser (2.4.0.0)
|
||||
@ -690,7 +689,7 @@ GEM
|
||||
rake (12.0.0)
|
||||
rblineprof (0.3.6)
|
||||
debugger-ruby_core_source (~> 1.3)
|
||||
rbnacl (3.4.0)
|
||||
rbnacl (4.0.2)
|
||||
ffi
|
||||
rbnacl-libsodium (1.0.11)
|
||||
rbnacl (>= 3.0.1)
|
||||
@ -730,7 +729,7 @@ GEM
|
||||
retriable (1.4.1)
|
||||
rinku (2.0.0)
|
||||
rotp (2.1.2)
|
||||
rouge (2.1.0)
|
||||
rouge (2.2.1)
|
||||
rqrcode (0.7.0)
|
||||
chunky_png
|
||||
rqrcode-rails3 (0.1.7)
|
||||
@ -777,6 +776,8 @@ GEM
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
rubocop-gitlab-security (0.1.0)
|
||||
rubocop (>= 0.47.1)
|
||||
rubocop-rspec (1.15.1)
|
||||
rubocop (>= 0.42.0)
|
||||
ruby-fogbugz (0.2.1)
|
||||
@ -838,6 +839,7 @@ GEM
|
||||
faraday (~> 0.9)
|
||||
jwt (~> 1.5)
|
||||
multi_json (~> 1.10)
|
||||
simple_po_parser (1.1.2)
|
||||
simplecov (0.14.1)
|
||||
docile (~> 1.1.0)
|
||||
json (>= 1.8, < 3)
|
||||
@ -905,7 +907,6 @@ GEM
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
underscore-rails (1.8.3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.2)
|
||||
@ -952,7 +953,7 @@ GEM
|
||||
expression_parser
|
||||
rinku
|
||||
xml-simple (1.1.5)
|
||||
xpath (2.0.0)
|
||||
xpath (2.1.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
PLATFORMS
|
||||
@ -965,7 +966,6 @@ DEPENDENCIES
|
||||
activerecord_sane_schema_dumper (= 0.2)
|
||||
acts-as-taggable-on (~> 4.0)
|
||||
addressable (~> 2.3.8)
|
||||
after_commit_queue (~> 1.3.0)
|
||||
akismet (~> 2.0)
|
||||
allocations (~> 1.0)
|
||||
asana (~> 0.6.0)
|
||||
@ -985,10 +985,10 @@ DEPENDENCIES
|
||||
browser (~> 2.2)
|
||||
bullet (~> 5.5.0)
|
||||
bundler-audit (~> 0.5.0)
|
||||
capybara (~> 2.6.2)
|
||||
capybara (~> 2.15.0)
|
||||
capybara-screenshot (~> 1.0.0)
|
||||
carrierwave (~> 1.1)
|
||||
charlock_holmes (~> 0.7.3)
|
||||
charlock_holmes (~> 0.7.5)
|
||||
chronic (~> 0.10.2)
|
||||
chronic_duration (~> 0.10.6)
|
||||
concurrent-ruby (~> 1.0.5)
|
||||
@ -1027,19 +1027,20 @@ DEPENDENCIES
|
||||
gettext (~> 3.2.2)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.2.0)
|
||||
gitaly (~> 0.26.0)
|
||||
gitaly-proto (~> 0.33.0)
|
||||
github-linguist (~> 4.7.0)
|
||||
gitlab-flowdock-git-hook (~> 1.0.1)
|
||||
gitlab-markup (~> 1.5.1)
|
||||
gitlab_omniauth-ldap (~> 2.0.3)
|
||||
gitlab_omniauth-ldap (~> 2.0.4)
|
||||
gollum-lib (~> 4.2)
|
||||
gollum-rugged_adapter (~> 0.4.4)
|
||||
gon (~> 6.1.0)
|
||||
google-api-client (~> 0.8.6)
|
||||
gpgme
|
||||
grape (~> 0.19.2)
|
||||
grape (~> 1.0)
|
||||
grape-entity (~> 0.6.0)
|
||||
grape-route-helpers (~> 2.0.0)
|
||||
grape-route-helpers (~> 2.1.0)
|
||||
grape_logging (~> 1.7)
|
||||
haml_lint (~> 0.26.0)
|
||||
hamlit (~> 2.6.1)
|
||||
hashie-forbidden_attributes
|
||||
@ -1049,7 +1050,7 @@ DEPENDENCIES
|
||||
html2text
|
||||
httparty (~> 0.13.3)
|
||||
influxdb (~> 0.2)
|
||||
jira-ruby (~> 1.1.2)
|
||||
jira-ruby (~> 1.4)
|
||||
jquery-atwho-rails (~> 1.3.2)
|
||||
jquery-rails (~> 4.1.0)
|
||||
json-schema (~> 2.6.2)
|
||||
@ -1069,7 +1070,7 @@ DEPENDENCIES
|
||||
mysql2 (~> 0.4.5)
|
||||
net-ldap
|
||||
net-ssh (~> 4.1.0)
|
||||
nokogiri (~> 1.8.0)
|
||||
nokogiri (~> 1.8.1)
|
||||
oauth2 (~> 1.4)
|
||||
octokit (~> 4.6.2)
|
||||
oj (~> 2.17.4)
|
||||
@ -1081,7 +1082,7 @@ DEPENDENCIES
|
||||
omniauth-facebook (~> 4.0.0)
|
||||
omniauth-github (~> 1.1.1)
|
||||
omniauth-gitlab (~> 1.0.2)
|
||||
omniauth-google-oauth2 (~> 0.4.1)
|
||||
omniauth-google-oauth2 (~> 0.5.2)
|
||||
omniauth-kerberos (~> 0.3.0)
|
||||
omniauth-oauth2-generic (~> 0.2.2)
|
||||
omniauth-saml (~> 1.7.0)
|
||||
@ -1115,7 +1116,7 @@ DEPENDENCIES
|
||||
rainbow (~> 2.2)
|
||||
raindrops (~> 0.18)
|
||||
rblineprof (~> 0.3.6)
|
||||
rbnacl (~> 3.2)
|
||||
rbnacl (~> 4.0)
|
||||
rbnacl-libsodium
|
||||
rdoc (~> 4.2)
|
||||
re2 (~> 1.1.1)
|
||||
@ -1134,6 +1135,7 @@ DEPENDENCIES
|
||||
rspec-set (~> 0.1.3)
|
||||
rspec_profiling (~> 0.0.5)
|
||||
rubocop (~> 0.49.1)
|
||||
rubocop-gitlab-security (~> 0.1.0)
|
||||
rubocop-rspec (~> 1.15.1)
|
||||
ruby-fogbugz (~> 0.2.1)
|
||||
ruby-prof (~> 0.16.2)
|
||||
@ -1152,6 +1154,7 @@ DEPENDENCIES
|
||||
sidekiq (~> 5.0)
|
||||
sidekiq-cron (~> 0.6.0)
|
||||
sidekiq-limit_fetch (~> 3.4)
|
||||
simple_po_parser (~> 1.1.2)
|
||||
simplecov (~> 0.14.0)
|
||||
slack-notifier (~> 1.5.1)
|
||||
spinach-rails (~> 0.2.1)
|
||||
@ -1170,7 +1173,6 @@ DEPENDENCIES
|
||||
truncato (~> 0.7.9)
|
||||
u2f (~> 0.2.1)
|
||||
uglifier (~> 2.7.2)
|
||||
underscore-rails (~> 1.8.0)
|
||||
unf (~> 0.1.4)
|
||||
unicorn (~> 5.1.0)
|
||||
unicorn-worker-killer (~> 0.4.4)
|
||||
@ -1183,4 +1185,4 @@ DEPENDENCIES
|
||||
wikicloth (= 0.8.1)
|
||||
|
||||
BUNDLED WITH
|
||||
1.15.3
|
||||
1.15.4
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
version = "9.5.5";
|
||||
version = "10.0.2";
|
||||
|
||||
gitlabDeb = fetchurl {
|
||||
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
|
||||
sha256 = "1wrwxksfqkha7qm2hbgs0z7lmgisdvdqa4wcll0qfzq1c3d286zz";
|
||||
sha256 = "0jsqjarvjzbxv1yiddzp5xwsqqrq5cvam0xn749p1vzqhcp8pahc";
|
||||
};
|
||||
|
||||
in
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "gitlabhq";
|
||||
repo = "gitlabhq";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qi21lkq69ah977vssbkllb7q5jwb0vf2ws5s3bzpvp2mj3iab5m";
|
||||
sha256 = "1602d6nkb41gg80n6p0wqxrjsn79s0z3817461d8dw2ha2dmbl34";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -122,15 +122,6 @@
|
||||
};
|
||||
version = "2.3.8";
|
||||
};
|
||||
after_commit_queue = {
|
||||
dependencies = ["activerecord"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
};
|
||||
akismet = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@ -383,13 +374,13 @@
|
||||
version = "9.0.6";
|
||||
};
|
||||
capybara = {
|
||||
dependencies = ["addressable" "mime-types" "nokogiri" "rack" "rack-test" "xpath"];
|
||||
dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ln77a5wwhd5sbxsh3v26xrwjnza0rgx2hn23yjggdlha03b00yw";
|
||||
sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.2";
|
||||
version = "2.15.1";
|
||||
};
|
||||
capybara-screenshot = {
|
||||
dependencies = ["capybara" "launchy"];
|
||||
@ -420,10 +411,10 @@
|
||||
charlock_holmes = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
|
||||
sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.3";
|
||||
version = "0.7.5";
|
||||
};
|
||||
chronic = {
|
||||
source = {
|
||||
@ -859,10 +850,10 @@
|
||||
ffi = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
|
||||
sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.10";
|
||||
version = "1.9.18";
|
||||
};
|
||||
flay = {
|
||||
dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"];
|
||||
@ -1076,14 +1067,14 @@
|
||||
};
|
||||
version = "0.3.2";
|
||||
};
|
||||
gitaly = {
|
||||
gitaly-proto = {
|
||||
dependencies = ["google-protobuf" "grpc"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vm3kp2qrlkrdd1r386fg97av73y2k3xxw4xl9wfjdqqhisyi6hw";
|
||||
sha256 = "0f15idw1850kwi0na6x3xlk13ljwx3mpfnxfv58631cmb3ac7wf8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.26.0";
|
||||
version = "0.33.0";
|
||||
};
|
||||
github-linguist = {
|
||||
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
|
||||
@ -1132,10 +1123,10 @@
|
||||
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lx5ayb8m2avw6iy9fq0d847z78npg2aax4pbcbprwwmpbnvzz4b";
|
||||
sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
};
|
||||
globalid = {
|
||||
dependencies = ["activesupport"];
|
||||
@ -1194,10 +1185,10 @@
|
||||
google-protobuf = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p";
|
||||
sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0";
|
||||
version = "3.4.0.2";
|
||||
};
|
||||
googleauth = {
|
||||
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
|
||||
@ -1218,13 +1209,13 @@
|
||||
version = "2.0.13";
|
||||
};
|
||||
grape = {
|
||||
dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "mustermann-grape" "rack" "rack-accept" "virtus"];
|
||||
dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ida2agz4f6hfxc4nvmls15f9cl1xg2pra04d388x40r5dmjp04x";
|
||||
sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.2";
|
||||
version = "1.0.0";
|
||||
};
|
||||
grape-entity = {
|
||||
dependencies = ["activesupport" "multi_json"];
|
||||
@ -1239,19 +1230,28 @@
|
||||
dependencies = ["activesupport" "grape" "rake"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qkaf2l56rxhacviqpzgqiwiv1fpbpxg5xgyp18x66mgxp9bpram";
|
||||
sha256 = "0ja4dlakk6r8p2cx113kymz9sbhdybjsiynnqpfs71lv0r6mmghj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
grape_logging = {
|
||||
dependencies = ["grape"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
};
|
||||
grpc = {
|
||||
dependencies = ["google-protobuf" "googleauth"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1siq5v4bmqlsb6122394dpk35fd2lxvjp4xnrabsb3vd90xqszcj";
|
||||
sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.4.5";
|
||||
};
|
||||
haml = {
|
||||
dependencies = ["tilt"];
|
||||
@ -1291,10 +1291,10 @@
|
||||
hashie = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw";
|
||||
sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
};
|
||||
hashie-forbidden_attributes = {
|
||||
dependencies = ["hashie"];
|
||||
@ -1434,13 +1434,13 @@
|
||||
version = "0.8.3";
|
||||
};
|
||||
jira-ruby = {
|
||||
dependencies = ["activesupport" "oauth"];
|
||||
dependencies = ["activesupport" "multipart-post" "oauth"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf";
|
||||
sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.2";
|
||||
version = "1.4.1";
|
||||
};
|
||||
jquery-atwho-rails = {
|
||||
source = {
|
||||
@ -1700,13 +1700,21 @@
|
||||
};
|
||||
version = "0.3.0";
|
||||
};
|
||||
mini_mime = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.4";
|
||||
};
|
||||
mini_portile2 = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
|
||||
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
};
|
||||
minitest = {
|
||||
source = {
|
||||
@ -1809,10 +1817,10 @@
|
||||
dependencies = ["mini_portile2"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
|
||||
sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
};
|
||||
numerizer = {
|
||||
source = {
|
||||
@ -1932,10 +1940,10 @@
|
||||
dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m6v2vm3h21ychd10wzkdhyhnrk9zhc1bgi4ahp5gwy00pggrppw";
|
||||
sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.1";
|
||||
version = "0.5.2";
|
||||
};
|
||||
omniauth-kerberos = {
|
||||
dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
|
||||
@ -2046,10 +2054,10 @@
|
||||
parallel = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yxhk64sfkm84v509m3mzmp0b7ra9lc7s8k6113yk9faih3g7w7v";
|
||||
sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
};
|
||||
paranoia = {
|
||||
dependencies = ["activerecord"];
|
||||
@ -2441,10 +2449,10 @@
|
||||
dependencies = ["ffi"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06xb4khgjblrmp1xgkjbmca0wl97i0nazf9pgx69vwr1ac03j920";
|
||||
sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
version = "4.0.2";
|
||||
};
|
||||
rbnacl-libsodium = {
|
||||
dependencies = ["rbnacl"];
|
||||
@ -2620,10 +2628,10 @@
|
||||
rouge = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1932gvvzfdky2z01sjri354ak7wq3nk9jmh7fiydfgjchfwk7sr4";
|
||||
sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png"];
|
||||
@ -2740,6 +2748,15 @@
|
||||
};
|
||||
version = "0.49.1";
|
||||
};
|
||||
rubocop-gitlab-security = {
|
||||
dependencies = ["rubocop"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
};
|
||||
rubocop-rspec = {
|
||||
dependencies = ["rubocop"];
|
||||
source = {
|
||||
@ -2990,6 +3007,14 @@
|
||||
};
|
||||
version = "0.7.3";
|
||||
};
|
||||
simple_po_parser = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.2";
|
||||
};
|
||||
simplecov = {
|
||||
dependencies = ["docile" "json" "simplecov-html"];
|
||||
source = {
|
||||
@ -3280,14 +3305,6 @@
|
||||
};
|
||||
version = "2.7.2";
|
||||
};
|
||||
underscore-rails = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.3";
|
||||
};
|
||||
unf = {
|
||||
dependencies = ["unf_ext"];
|
||||
source = {
|
||||
@ -3455,9 +3472,9 @@
|
||||
dependencies = ["nokogiri"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
|
||||
sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
}
|
||||
@ -62,22 +62,16 @@ diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
|
||||
index 59b21149a9..4f4a39a06c 100644
|
||||
--- a/lib/gitlab/logger.rb
|
||||
+++ b/lib/gitlab/logger.rb
|
||||
@@ -13,20 +13,20 @@ module Gitlab
|
||||
@@ -13,7 +13,7 @@
|
||||
end
|
||||
|
||||
def self.read_latest
|
||||
- path = Rails.root.join("log", file_name)
|
||||
+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
|
||||
self.build unless File.exist?(path)
|
||||
tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
|
||||
tail_output.split("\n")
|
||||
end
|
||||
|
||||
def self.read_latest_for(filename)
|
||||
- path = Rails.root.join("log", filename)
|
||||
+ path = File.join(ENV["GITLAB_LOG_PATH"], filename)
|
||||
tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
|
||||
tail_output.split("\n")
|
||||
return [] unless File.readable?(path)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
end
|
||||
|
||||
def self.build
|
||||
@ -158,3 +152,14 @@ index b276a81eac..070e3ebd81 100644
|
||||
end
|
||||
end
|
||||
end
|
||||
--- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
class API < Grape::API
|
||||
include APIGuard
|
||||
|
||||
- LOG_FILENAME = Rails.root.join("log", "api_json.log")
|
||||
+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
|
||||
|
||||
use GrapeLogging::Middleware::RequestLogger,
|
||||
logger: Logger.new(LOG_FILENAME),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user