lol

gitlab: 10.3.4 -> 10.5.4

authored by

Simon Lackerbauer and committed by
Robin Gloster
1b559058 73a7f984

+269 -182
+3
nixos/modules/services/misc/gitlab.nix
··· 143 143 GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; 144 144 GITLAB_STATE_PATH = "${cfg.statePath}"; 145 145 GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; 146 + SCHEMA = "${cfg.statePath}/db/schema.rb"; 146 147 GITLAB_LOG_PATH = "${cfg.statePath}/log"; 147 148 GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}"; 148 149 GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml"; ··· 566 567 mkdir -p ${cfg.statePath}/tmp/pids 567 568 mkdir -p ${cfg.statePath}/tmp/sockets 568 569 mkdir -p ${cfg.statePath}/shell 570 + mkdir -p ${cfg.statePath}/db 569 571 570 572 rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks 571 573 mkdir -p ${cfg.statePath}/config ··· 588 590 touch ${gitlabEnv.HOME}/.ssh/authorized_keys 589 591 chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/ 590 592 593 + cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db 591 594 cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config 592 595 ${optionalString cfg.smtp.enable '' 593 596 ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+34 -20
pkgs/applications/version-management/gitlab/Gemfile
··· 12 12 gem 'default_value_for', '~> 3.0.0' 13 13 14 14 # Supported DBs 15 - gem 'mysql2', '~> 0.4.5', group: :mysql 15 + gem 'mysql2', '~> 0.4.10', group: :mysql 16 16 gem 'pg', '~> 0.18.2', group: :postgres 17 17 18 18 gem 'rugged', '~> 0.26.0' ··· 69 69 70 70 # Git Wiki 71 71 # Required manually in config/initializers/gollum.rb to control load order 72 + # Before updating this gem, check if 73 + # https://github.com/gollum/gollum-lib/pull/292 has been merged. 74 + # If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer 75 + # in config/initializers/gollum.rb 72 76 gem 'gollum-lib', '~> 4.2', require: false 77 + 78 + # Before updating this gem, check if 79 + # https://github.com/gollum/rugged_adapter/pull/28 has been merged. 80 + # If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb 73 81 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false 74 82 75 83 # Language detection ··· 78 86 # API 79 87 gem 'grape', '~> 1.0' 80 88 gem 'grape-entity', '~> 0.6.0' 81 - gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' 89 + gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' 82 90 83 91 # Disable strong_params so that Mash does not respond to :permitted? 84 92 gem 'hashie-forbidden_attributes' ··· 111 119 gem 'unf', '~> 0.1.4' 112 120 113 121 # Seed data 114 - gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved 122 + gem 'seed-fu', '~> 2.3.7' 115 123 116 124 # Markdown and HTML processing 117 125 gem 'html-pipeline', '~> 1.11.0' ··· 128 136 gem 'rouge', '~> 2.0' 129 137 gem 'truncato', '~> 0.7.9' 130 138 gem 'bootstrap_form', '~> 2.7.0' 131 - gem 'nokogiri', '~> 1.8.1' 139 + gem 'nokogiri', '~> 1.8.2' 132 140 133 141 # Diffs 134 142 gem 'diffy', '~> 3.1.0' ··· 229 237 # Faster JSON 230 238 gem 'oj', '~> 2.17.4' 231 239 240 + # Faster blank 241 + gem 'fast_blank' 242 + 232 243 # Parse time & duration 233 244 gem 'chronic', '~> 0.10.2' 234 245 gem 'chronic_duration', '~> 0.10.6' ··· 263 274 gem 'gettext_i18n_rails_js', '~> 1.2.0' 264 275 gem 'gettext', '~> 3.2.2', require: false, group: :development 265 276 266 - gem 'batch-loader' 277 + gem 'batch-loader', '~> 1.2.1' 267 278 268 279 # Perf bar 269 280 gem 'peek', '~> 1.0.1' ··· 283 294 gem 'influxdb', '~> 0.2', require: false 284 295 285 296 # Prometheus 286 - gem 'prometheus-client-mmap', '~> 0.7.0.beta43' 297 + gem 'prometheus-client-mmap', '~> 0.9.1' 287 298 gem 'raindrops', '~> 0.18' 288 299 end 289 300 ··· 311 322 gem 'fuubar', '~> 2.2.0' 312 323 313 324 gem 'database_cleaner', '~> 1.5.0' 314 - gem 'factory_girl_rails', '~> 4.7.0' 325 + gem 'factory_bot_rails', '~> 4.8.2' 315 326 gem 'rspec-rails', '~> 3.6.0' 316 327 gem 'rspec-retry', '~> 0.4.5' 317 328 gem 'spinach-rails', '~> 0.2.1' 318 329 gem 'spinach-rerun-reporter', '~> 0.0.2' 319 330 gem 'rspec_profiling', '~> 0.0.5' 320 331 gem 'rspec-set', '~> 0.1.3' 321 - gem 'rspec-parameterized' 332 + gem 'rspec-parameterized', require: false 322 333 323 334 # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) 324 335 gem 'minitest', '~> 5.7.0' ··· 334 345 gem 'spring-commands-rspec', '~> 1.0.4' 335 346 gem 'spring-commands-spinach', '~> 1.1.0' 336 347 337 - gem 'rubocop', '~> 0.49.1', require: false 338 - gem 'rubocop-rspec', '~> 1.15.1', require: false 339 - gem 'rubocop-gitlab-security', '~> 0.1.0', require: false 340 - gem 'scss_lint', '~> 0.54.0', require: false 348 + gem 'gitlab-styles', '~> 2.3', require: false 349 + # Pin these dependencies, otherwise a new rule could break the CI pipelines 350 + gem 'rubocop', '~> 0.52.1' 351 + gem 'rubocop-rspec', '~> 1.22.1' 352 + 353 + gem 'scss_lint', '~> 0.56.0', require: false 341 354 gem 'haml_lint', '~> 0.26.0', require: false 342 355 gem 'simplecov', '~> 0.14.0', require: false 343 - gem 'flay', '~> 2.8.0', require: false 356 + gem 'flay', '~> 2.10.0', require: false 344 357 gem 'bundler-audit', '~> 0.5.0', require: false 345 358 346 359 gem 'benchmark-ips', '~> 2.3.0', require: false ··· 379 392 # OAuth 380 393 gem 'oauth2', '~> 1.4' 381 394 382 - # Soft deletion 383 - gem 'paranoia', '~> 2.3.1' 384 - 385 395 # Health check 386 396 gem 'health_check', '~> 2.6.0' 387 397 ··· 400 410 end 401 411 402 412 # Gitaly GRPC client 403 - gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' 413 + gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' 414 + # Locked until https://github.com/google/protobuf/issues/4210 is closed 415 + gem 'google-protobuf', '= 3.5.1' 404 416 405 417 gem 'toml-rb', '~> 0.3.15', require: false 406 418 407 419 # Feature toggles 408 - gem 'flipper', '~> 0.10.2' 409 - gem 'flipper-active_record', '~> 0.10.2' 420 + gem 'flipper', '~> 0.11.0' 421 + gem 'flipper-active_record', '~> 0.11.0' 422 + gem 'flipper-active_support_cache_store', '~> 0.11.0' 410 423 411 424 # Structured logging 412 425 gem 'lograge', '~> 0.5' 413 426 gem 'grape_logging', '~> 1.7' 414 427 415 - gem 'activerecord-nulldb-adapter' 428 + # Asset synchronization 429 + gem 'asset_sync', '~> 2.2.0'
+76 -55
pkgs/applications/version-management/gitlab/Gemfile.lock
··· 33 33 activemodel (= 4.2.10) 34 34 activesupport (= 4.2.10) 35 35 arel (~> 6.0) 36 - activerecord-nulldb-adapter (0.3.7) 37 - activerecord (>= 2.0.0) 38 36 activerecord_sane_schema_dumper (0.2) 39 37 rails (>= 4, < 5) 40 38 activesupport (4.2.10) ··· 60 58 asciidoctor (1.5.3) 61 59 asciidoctor-plantuml (0.0.7) 62 60 asciidoctor (~> 1.5) 61 + asset_sync (2.2.0) 62 + activemodel (>= 4.1.0) 63 + fog-core 64 + mime-types (>= 2.99) 65 + unf 63 66 ast (2.3.0) 64 67 atomic (1.1.99) 65 68 attr_encrypted (3.0.3) ··· 75 78 thread_safe (~> 0.3, >= 0.3.1) 76 79 babosa (1.0.2) 77 80 base32 (0.3.2) 78 - batch-loader (1.1.1) 81 + batch-loader (1.2.1) 79 82 bcrypt (3.1.11) 80 83 bcrypt_pbkdf (1.0.0) 81 84 benchmark-ips (2.3.0) ··· 192 195 excon (0.57.1) 193 196 execjs (2.6.0) 194 197 expression_parser (0.9.0) 195 - factory_girl (4.7.0) 198 + factory_bot (4.8.2) 196 199 activesupport (>= 3.0.0) 197 - factory_girl_rails (4.7.0) 198 - factory_girl (~> 4.7.0) 200 + factory_bot_rails (4.8.2) 201 + factory_bot (~> 4.8.2) 199 202 railties (>= 3.0.0) 200 203 faraday (0.12.2) 201 204 multipart-post (>= 1.2, < 3) ··· 204 207 faraday_middleware-multi_json (0.0.6) 205 208 faraday_middleware 206 209 multi_json 210 + fast_blank (1.0.0) 207 211 fast_gettext (1.4.0) 208 212 ffaker (2.4.0) 209 213 ffi (1.9.18) 210 - flay (2.8.1) 214 + flay (2.10.0) 211 215 erubis (~> 2.7.0) 212 216 path_expander (~> 1.0) 213 217 ruby_parser (~> 3.0) 214 218 sexp_processor (~> 4.0) 215 - flipper (0.10.2) 216 - flipper-active_record (0.10.2) 219 + flipper (0.11.0) 220 + flipper-active_record (0.11.0) 217 221 activerecord (>= 3.2, < 6) 218 - flipper (~> 0.10.2) 222 + flipper (~> 0.11.0) 223 + flipper-active_support_cache_store (0.11.0) 224 + activesupport (>= 3.2, < 6) 225 + flipper (~> 0.11.0) 219 226 flowdock (0.7.1) 220 227 httparty (~> 0.7) 221 228 multi_json ··· 278 285 po_to_json (>= 1.0.0) 279 286 rails (>= 3.2.0) 280 287 gherkin-ruby (0.3.2) 281 - gitaly-proto (0.59.0) 288 + gitaly-proto (0.84.0) 282 289 google-protobuf (~> 3.1) 283 290 grpc (~> 1.0) 284 291 github-linguist (4.7.6) ··· 297 304 mime-types (>= 1.16) 298 305 posix-spawn (~> 0.3) 299 306 gitlab-markup (1.6.3) 307 + gitlab-styles (2.3.2) 308 + rubocop (~> 0.51) 309 + rubocop-gitlab-security (~> 0.1.0) 310 + rubocop-rspec (~> 1.19) 300 311 gitlab_omniauth-ldap (2.0.4) 301 312 net-ldap (~> 0.16) 302 313 omniauth (~> 1.3) ··· 329 340 mime-types (~> 3.0) 330 341 representable (~> 3.0) 331 342 retriable (>= 2.0, < 4.0) 332 - google-protobuf (3.4.1.1) 343 + google-protobuf (3.5.1) 344 + googleapis-common-protos-types (1.0.1) 345 + google-protobuf (~> 3.0) 333 346 googleauth (0.5.3) 334 347 faraday (~> 0.12) 335 348 jwt (~> 1.4) ··· 356 369 rake 357 370 grape_logging (1.7.0) 358 371 grape 359 - grpc (1.4.5) 372 + grpc (1.8.3) 360 373 google-protobuf (~> 3.1) 361 - googleauth (~> 0.5.1) 374 + googleapis-common-protos-types (~> 1.0.0) 375 + googleauth (>= 0.5.1, < 0.7) 362 376 haml (4.0.7) 363 377 tilt 364 378 haml_lint (0.26.0) ··· 495 509 mustermann (1.0.0) 496 510 mustermann-grape (1.0.0) 497 511 mustermann (~> 1.0.0) 498 - mysql2 (0.4.5) 512 + mysql2 (0.4.10) 499 513 net-ldap (0.16.0) 500 514 net-ssh (4.1.0) 501 515 netrc (0.11.0) 502 - nokogiri (1.8.1) 516 + nokogiri (1.8.2) 503 517 mini_portile2 (~> 2.3.0) 504 518 numerizer (0.1.1) 505 519 oauth (0.5.1) ··· 569 583 rubypants (~> 0.2) 570 584 orm_adapter (0.5.0) 571 585 os (0.9.6) 572 - parallel (1.12.0) 573 - paranoia (2.3.1) 574 - activerecord (>= 4.0, < 5.2) 586 + parallel (1.12.1) 575 587 parser (2.4.0.2) 576 588 ast (~> 2.3) 577 589 parslet (1.5.0) 578 590 blankslate (~> 2.0) 579 - path_expander (1.0.1) 591 + path_expander (1.0.2) 580 592 peek (1.0.1) 581 593 concurrent-ruby (>= 0.9.0) 582 594 concurrent-ruby-ext (>= 0.9.0) ··· 624 636 parser 625 637 unparser 626 638 procto (0.0.3) 627 - prometheus-client-mmap (0.7.0.beta43) 639 + prometheus-client-mmap (0.9.1) 628 640 pry (0.10.4) 629 641 coderay (~> 1.1.0) 630 642 method_source (~> 0.8.1) ··· 641 653 rack (>= 0.4) 642 654 rack-attack (4.4.1) 643 655 rack 644 - rack-cors (0.4.0) 656 + rack-cors (1.0.2) 645 657 rack-oauth2 (1.2.3) 646 658 activesupport (>= 2.3) 647 659 attr_required (>= 0.0.5) ··· 685 697 rake 686 698 raindrops (0.18.0) 687 699 rake (12.3.0) 700 + rb-fsevent (0.10.2) 701 + rb-inotify (0.9.10) 702 + ffi (>= 0.5.0, < 2) 688 703 rblineprof (0.3.6) 689 704 debugger-ruby_core_source (~> 1.3) 690 705 rbnacl (4.0.2) ··· 698 713 json 699 714 recursive-open-struct (1.0.0) 700 715 redcarpet (3.4.0) 701 - redis (3.3.3) 716 + redis (3.3.5) 702 717 redis-actionpack (5.0.2) 703 718 actionpack (>= 4.0, < 6) 704 719 redis-rack (>= 1, < 3) ··· 771 786 pg 772 787 rails 773 788 sqlite3 774 - rubocop (0.49.1) 789 + rubocop (0.52.1) 775 790 parallel (~> 1.10) 776 - parser (>= 2.3.3.1, < 3.0) 791 + parser (>= 2.4.0.2, < 3.0) 777 792 powerpack (~> 0.1) 778 - rainbow (>= 1.99.1, < 3.0) 793 + rainbow (>= 2.2.2, < 4.0) 779 794 ruby-progressbar (~> 1.7) 780 795 unicode-display_width (~> 1.0, >= 1.0.1) 781 - rubocop-gitlab-security (0.1.0) 782 - rubocop (>= 0.47.1) 783 - rubocop-rspec (1.15.1) 784 - rubocop (>= 0.42.0) 796 + rubocop-gitlab-security (0.1.1) 797 + rubocop (>= 0.51) 798 + rubocop-rspec (1.22.1) 799 + rubocop (>= 0.52.1) 785 800 ruby-fogbugz (0.2.1) 786 801 crack (~> 0.4) 787 802 ruby-prof (0.16.2) 788 - ruby-progressbar (1.8.1) 803 + ruby-progressbar (1.9.0) 789 804 ruby-saml (1.4.1) 790 805 nokogiri (>= 1.5.10) 791 806 ruby_parser (3.9.0) ··· 799 814 safe_yaml (1.0.4) 800 815 sanitize (2.1.0) 801 816 nokogiri (>= 1.4.4) 802 - sass (3.4.22) 817 + sass (3.5.5) 818 + sass-listen (~> 4.0.0) 819 + sass-listen (4.0.0) 820 + rb-fsevent (~> 0.9, >= 0.9.4) 821 + rb-inotify (~> 0.9, >= 0.9.7) 803 822 sass-rails (5.0.6) 804 823 railties (>= 4.0.0, < 6) 805 824 sass (~> 3.1) ··· 809 828 sawyer (0.8.1) 810 829 addressable (>= 2.3.5, < 2.6) 811 830 faraday (~> 0.8, < 1.0) 812 - scss_lint (0.54.0) 831 + scss_lint (0.56.0) 813 832 rake (>= 0.9, < 13) 814 - sass (~> 3.4.20) 833 + sass (~> 3.5.3) 815 834 securecompare (1.0.0) 816 - seed-fu (2.3.6) 835 + seed-fu (2.3.7) 817 836 activerecord (>= 3.1) 818 837 activesupport (>= 3.1) 819 838 select2-rails (3.5.9.3) ··· 829 848 rack 830 849 shoulda-matchers (3.1.2) 831 850 activesupport (>= 4.0.0) 832 - sidekiq (5.0.4) 851 + sidekiq (5.0.5) 833 852 concurrent-ruby (~> 1.0) 834 853 connection_pool (~> 2.2, >= 2.2.0) 835 854 rack-protection (>= 1.5.0) 836 - redis (~> 3.3, >= 3.3.3) 855 + redis (>= 3.3.4, < 5) 837 856 sidekiq-cron (0.6.0) 838 857 rufus-scheduler (>= 3.3.0) 839 858 sidekiq (>= 4.2.1) ··· 969 988 DEPENDENCIES 970 989 RedCloth (~> 4.3.2) 971 990 ace-rails-ap (~> 4.1.0) 972 - activerecord-nulldb-adapter 973 991 activerecord_sane_schema_dumper (= 0.2) 974 992 acts-as-taggable-on (~> 4.0) 975 993 addressable (~> 2.5.2) ··· 978 996 asana (~> 0.6.0) 979 997 asciidoctor (~> 1.5.2) 980 998 asciidoctor-plantuml (= 0.0.7) 999 + asset_sync (~> 2.2.0) 981 1000 attr_encrypted (~> 3.0.0) 982 1001 awesome_print (~> 1.2.0) 983 1002 babosa (~> 1.0.2) 984 1003 base32 (~> 0.3.0) 985 - batch-loader 1004 + batch-loader (~> 1.2.1) 986 1005 bcrypt_pbkdf (~> 1.0) 987 1006 benchmark-ips (~> 2.3.0) 988 1007 better_errors (~> 2.1.0) ··· 1014 1033 dropzonejs-rails (~> 0.7.1) 1015 1034 email_reply_trimmer (~> 0.1) 1016 1035 email_spec (~> 1.6.0) 1017 - factory_girl_rails (~> 4.7.0) 1036 + factory_bot_rails (~> 4.8.2) 1018 1037 faraday (~> 0.12) 1038 + fast_blank 1019 1039 ffaker (~> 2.4) 1020 - flay (~> 2.8.0) 1021 - flipper (~> 0.10.2) 1022 - flipper-active_record (~> 0.10.2) 1040 + flay (~> 2.10.0) 1041 + flipper (~> 0.11.0) 1042 + flipper-active_record (~> 0.11.0) 1043 + flipper-active_support_cache_store (~> 0.11.0) 1023 1044 fog-aliyun (~> 0.2.0) 1024 1045 fog-aws (~> 1.4) 1025 1046 fog-core (~> 1.44) ··· 1035 1056 gettext (~> 3.2.2) 1036 1057 gettext_i18n_rails (~> 1.8.0) 1037 1058 gettext_i18n_rails_js (~> 1.2.0) 1038 - gitaly-proto (~> 0.59.0) 1059 + gitaly-proto (~> 0.84.0) 1039 1060 github-linguist (~> 4.7.0) 1040 1061 gitlab-flowdock-git-hook (~> 1.0.1) 1041 1062 gitlab-markup (~> 1.6.2) 1063 + gitlab-styles (~> 2.3) 1042 1064 gitlab_omniauth-ldap (~> 2.0.4) 1043 1065 gollum-lib (~> 4.2) 1044 1066 gollum-rugged_adapter (~> 0.4.4) 1045 1067 gon (~> 6.1.0) 1046 1068 google-api-client (~> 0.13.6) 1069 + google-protobuf (= 3.5.1) 1047 1070 gpgme 1048 1071 grape (~> 1.0) 1049 1072 grape-entity (~> 0.6.0) ··· 1075 1098 method_source (~> 0.8) 1076 1099 minitest (~> 5.7.0) 1077 1100 mousetrap-rails (~> 1.4.6) 1078 - mysql2 (~> 0.4.5) 1101 + mysql2 (~> 0.4.10) 1079 1102 net-ldap 1080 1103 net-ssh (~> 4.1.0) 1081 - nokogiri (~> 1.8.1) 1104 + nokogiri (~> 1.8.2) 1082 1105 oauth2 (~> 1.4) 1083 1106 octokit (~> 4.6.2) 1084 1107 oj (~> 2.17.4) ··· 1098 1121 omniauth-twitter (~> 1.2.0) 1099 1122 omniauth_crowd (~> 2.2.0) 1100 1123 org-ruby (~> 0.9.12) 1101 - paranoia (~> 2.3.1) 1102 1124 peek (~> 1.0.1) 1103 1125 peek-gc (~> 0.0.2) 1104 1126 peek-host (~> 1.0.0) ··· 1110 1132 peek-sidekiq (~> 1.0.3) 1111 1133 pg (~> 0.18.2) 1112 1134 premailer-rails (~> 1.9.7) 1113 - prometheus-client-mmap (~> 0.7.0.beta43) 1135 + prometheus-client-mmap (~> 0.9.1) 1114 1136 pry-byebug (~> 3.4.1) 1115 1137 pry-rails (~> 0.3.4) 1116 1138 rack-attack (~> 4.4.1) 1117 - rack-cors (~> 0.4.0) 1139 + rack-cors (~> 1.0.0) 1118 1140 rack-oauth2 (~> 1.2.1) 1119 1141 rack-proxy (~> 0.6.0) 1120 1142 rails (= 4.2.10) ··· 1141 1163 rspec-retry (~> 0.4.5) 1142 1164 rspec-set (~> 0.1.3) 1143 1165 rspec_profiling (~> 0.0.5) 1144 - rubocop (~> 0.49.1) 1145 - rubocop-gitlab-security (~> 0.1.0) 1146 - rubocop-rspec (~> 1.15.1) 1166 + rubocop (~> 0.52.1) 1167 + rubocop-rspec (~> 1.22.1) 1147 1168 ruby-fogbugz (~> 0.2.1) 1148 1169 ruby-prof (~> 0.16.2) 1149 1170 ruby_parser (~> 3.8) ··· 1151 1172 rugged (~> 0.26.0) 1152 1173 sanitize (~> 2.0) 1153 1174 sass-rails (~> 5.0.6) 1154 - scss_lint (~> 0.54.0) 1155 - seed-fu (= 2.3.6) 1175 + scss_lint (~> 0.56.0) 1176 + seed-fu (~> 2.3.7) 1156 1177 select2-rails (~> 3.5.9) 1157 1178 selenium-webdriver (~> 3.5) 1158 1179 sentry-raven (~> 2.5.3) ··· 1194 1215 wikicloth (= 0.8.1) 1195 1216 1196 1217 BUNDLED WITH 1197 - 1.16.0 1218 + 1.16.1
+3 -3
pkgs/applications/version-management/gitlab/default.nix
··· 18 18 }; 19 19 }; 20 20 21 - version = "10.3.4"; 21 + version = "10.5.4"; 22 22 23 23 gitlabDeb = fetchurl { 24 24 url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; 25 - sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica"; 25 + sha256 = "1fsz2rdfcb1a2a2jwl8009r8ldi1rg8rj07751lgwy52jdp1ihka"; 26 26 }; 27 27 28 28 in ··· 34 34 owner = "gitlabhq"; 35 35 repo = "gitlabhq"; 36 36 rev = "v${version}"; 37 - sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1"; 37 + sha256 = "1glvqzbspaw88nwmgpxvkz52a4pz3wp3h5xs1f9kc32k2vh384nz"; 38 38 }; 39 39 40 40 buildInputs = [
+124 -71
pkgs/applications/version-management/gitlab/gemset.nix
··· 69 69 }; 70 70 version = "4.2.10"; 71 71 }; 72 - activerecord-nulldb-adapter = { 73 - dependencies = ["activerecord"]; 74 - source = { 75 - remotes = ["https://rubygems.org"]; 76 - sha256 = "1dxk26drn3s0mpyk8ir30k1pg5fqndrnsdjkkncn0acylq4ja27z"; 77 - type = "gem"; 78 - }; 79 - version = "0.3.7"; 80 - }; 81 72 activerecord_sane_schema_dumper = { 82 73 dependencies = ["rails"]; 83 74 source = { ··· 173 164 }; 174 165 version = "0.0.7"; 175 166 }; 167 + asset_sync = { 168 + dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; 169 + source = { 170 + remotes = ["https://rubygems.org"]; 171 + sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0"; 172 + type = "gem"; 173 + }; 174 + version = "2.2.0"; 175 + }; 176 176 ast = { 177 177 source = { 178 178 remotes = ["https://rubygems.org"]; ··· 251 251 batch-loader = { 252 252 source = { 253 253 remotes = ["https://rubygems.org"]; 254 - sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv"; 254 + sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2"; 255 255 type = "gem"; 256 256 }; 257 - version = "1.1.1"; 257 + version = "1.2.1"; 258 258 }; 259 259 bcrypt = { 260 260 source = { ··· 803 803 }; 804 804 version = "0.9.0"; 805 805 }; 806 - factory_girl = { 806 + factory_bot = { 807 807 dependencies = ["activesupport"]; 808 808 source = { 809 809 remotes = ["https://rubygems.org"]; 810 - sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; 810 + sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; 811 811 type = "gem"; 812 812 }; 813 - version = "4.7.0"; 813 + version = "4.8.2"; 814 814 }; 815 - factory_girl_rails = { 816 - dependencies = ["factory_girl" "railties"]; 815 + factory_bot_rails = { 816 + dependencies = ["factory_bot" "railties"]; 817 817 source = { 818 818 remotes = ["https://rubygems.org"]; 819 - sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; 819 + sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; 820 820 type = "gem"; 821 821 }; 822 - version = "4.7.0"; 822 + version = "4.8.2"; 823 823 }; 824 824 faraday = { 825 825 dependencies = ["multipart-post"]; ··· 848 848 }; 849 849 version = "0.0.6"; 850 850 }; 851 + fast_blank = { 852 + source = { 853 + remotes = ["https://rubygems.org"]; 854 + sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; 855 + type = "gem"; 856 + }; 857 + version = "1.0.0"; 858 + }; 851 859 fast_gettext = { 852 860 source = { 853 861 remotes = ["https://rubygems.org"]; ··· 876 884 dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"]; 877 885 source = { 878 886 remotes = ["https://rubygems.org"]; 879 - sha256 = "1x563gyx292ka3awps6h6hmswqf71zdxnzw0pfv6p2mhd2zwxaba"; 887 + sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3"; 880 888 type = "gem"; 881 889 }; 882 - version = "2.8.1"; 890 + version = "2.10.0"; 883 891 }; 884 892 flipper = { 885 893 source = { 886 894 remotes = ["https://rubygems.org"]; 887 - sha256 = "1gbvd4j0rkr7qc3mnjdw4r9p6lffnwv7rvm1cyr8a0avjky34n8p"; 895 + sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87"; 888 896 type = "gem"; 889 897 }; 890 - version = "0.10.2"; 898 + version = "0.11.0"; 891 899 }; 892 900 flipper-active_record = { 893 901 dependencies = ["activerecord" "flipper"]; 894 902 source = { 895 903 remotes = ["https://rubygems.org"]; 896 - sha256 = "053lq791z8bf3xv6kb14nq3yrzjpmlyhzq3kvys978dc8yw78ld7"; 904 + sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91"; 897 905 type = "gem"; 898 906 }; 899 - version = "0.10.2"; 907 + version = "0.11.0"; 908 + }; 909 + flipper-active_support_cache_store = { 910 + dependencies = ["activesupport" "flipper"]; 911 + source = { 912 + remotes = ["https://rubygems.org"]; 913 + sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb"; 914 + type = "gem"; 915 + }; 916 + version = "0.11.0"; 900 917 }; 901 918 flowdock = { 902 919 dependencies = ["httparty" "multi_json"]; ··· 1088 1105 dependencies = ["google-protobuf" "grpc"]; 1089 1106 source = { 1090 1107 remotes = ["https://rubygems.org"]; 1091 - sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; 1108 + sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8"; 1092 1109 type = "gem"; 1093 1110 }; 1094 - version = "0.59.0"; 1111 + version = "0.84.0"; 1095 1112 }; 1096 1113 github-linguist = { 1097 1114 dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; ··· 1136 1153 }; 1137 1154 version = "1.6.3"; 1138 1155 }; 1156 + gitlab-styles = { 1157 + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; 1158 + source = { 1159 + remotes = ["https://rubygems.org"]; 1160 + sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0"; 1161 + type = "gem"; 1162 + }; 1163 + version = "2.3.2"; 1164 + }; 1139 1165 gitlab_omniauth-ldap = { 1140 1166 dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; 1141 1167 source = { ··· 1202 1228 google-protobuf = { 1203 1229 source = { 1204 1230 remotes = ["https://rubygems.org"]; 1205 - sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6"; 1231 + sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; 1206 1232 type = "gem"; 1207 1233 }; 1208 - version = "3.4.1.1"; 1234 + version = "3.5.1"; 1235 + }; 1236 + googleapis-common-protos-types = { 1237 + dependencies = ["google-protobuf"]; 1238 + source = { 1239 + remotes = ["https://rubygems.org"]; 1240 + sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; 1241 + type = "gem"; 1242 + }; 1243 + version = "1.0.1"; 1209 1244 }; 1210 1245 googleauth = { 1211 1246 dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; ··· 1262 1297 version = "1.7.0"; 1263 1298 }; 1264 1299 grpc = { 1265 - dependencies = ["google-protobuf" "googleauth"]; 1300 + dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; 1266 1301 source = { 1267 1302 remotes = ["https://rubygems.org"]; 1268 - sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; 1303 + sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j"; 1269 1304 type = "gem"; 1270 1305 }; 1271 - version = "1.4.5"; 1306 + version = "1.8.3"; 1272 1307 }; 1273 1308 haml = { 1274 1309 dependencies = ["tilt"]; ··· 1803 1838 mysql2 = { 1804 1839 source = { 1805 1840 remotes = ["https://rubygems.org"]; 1806 - sha256 = "1kh96xp396swyaddz5l2zqjxi3cvyqv62scak9b3f98j14ynfscl"; 1841 + sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; 1807 1842 type = "gem"; 1808 1843 }; 1809 - version = "0.4.5"; 1844 + version = "0.4.10"; 1810 1845 }; 1811 1846 net-ldap = { 1812 1847 source = { ··· 1836 1871 dependencies = ["mini_portile2"]; 1837 1872 source = { 1838 1873 remotes = ["https://rubygems.org"]; 1839 - sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; 1874 + sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; 1840 1875 type = "gem"; 1841 1876 }; 1842 - version = "1.8.1"; 1877 + version = "1.8.2"; 1843 1878 }; 1844 1879 numerizer = { 1845 1880 source = { ··· 2073 2108 parallel = { 2074 2109 source = { 2075 2110 remotes = ["https://rubygems.org"]; 2076 - sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd"; 2111 + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; 2077 2112 type = "gem"; 2078 2113 }; 2079 - version = "1.12.0"; 2080 - }; 2081 - paranoia = { 2082 - dependencies = ["activerecord"]; 2083 - source = { 2084 - remotes = ["https://rubygems.org"]; 2085 - sha256 = "1ibdga0a0px8rf82qnmgm59z3z4s27r11i2i24087f0yh8z8bd7z"; 2086 - type = "gem"; 2087 - }; 2088 - version = "2.3.1"; 2114 + version = "1.12.1"; 2089 2115 }; 2090 2116 parser = { 2091 2117 dependencies = ["ast"]; ··· 2108 2134 path_expander = { 2109 2135 source = { 2110 2136 remotes = ["https://rubygems.org"]; 2111 - sha256 = "0hklnfb0br6mx6l25zknz2zj6r152i0jiy6fn6ki220x0l5m2h59"; 2137 + sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a"; 2112 2138 type = "gem"; 2113 2139 }; 2114 - version = "1.0.1"; 2140 + version = "1.0.2"; 2115 2141 }; 2116 2142 peek = { 2117 2143 dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; ··· 2265 2291 prometheus-client-mmap = { 2266 2292 source = { 2267 2293 remotes = ["https://rubygems.org"]; 2268 - sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij"; 2294 + sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn"; 2269 2295 type = "gem"; 2270 2296 }; 2271 - version = "0.7.0.beta43"; 2297 + version = "0.9.1"; 2272 2298 }; 2273 2299 pry = { 2274 2300 dependencies = ["coderay" "method_source" "slop"]; ··· 2342 2368 rack-cors = { 2343 2369 source = { 2344 2370 remotes = ["https://rubygems.org"]; 2345 - sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw"; 2371 + sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; 2346 2372 type = "gem"; 2347 2373 }; 2348 - version = "0.4.0"; 2374 + version = "1.0.2"; 2349 2375 }; 2350 2376 rack-oauth2 = { 2351 2377 dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; ··· 2461 2487 type = "gem"; 2462 2488 }; 2463 2489 version = "12.3.0"; 2490 + }; 2491 + rb-fsevent = { 2492 + source = { 2493 + remotes = ["https://rubygems.org"]; 2494 + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; 2495 + type = "gem"; 2496 + }; 2497 + version = "0.10.2"; 2498 + }; 2499 + rb-inotify = { 2500 + dependencies = ["ffi"]; 2501 + source = { 2502 + remotes = ["https://rubygems.org"]; 2503 + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; 2504 + type = "gem"; 2505 + }; 2506 + version = "0.9.10"; 2464 2507 }; 2465 2508 rblineprof = { 2466 2509 dependencies = ["debugger-ruby_core_source"]; ··· 2542 2585 redis = { 2543 2586 source = { 2544 2587 remotes = ["https://rubygems.org"]; 2545 - sha256 = "0kdj7511l6kqvqmaiw7kw604c83pk6f4b540gdsq1bf7yxm6qx6g"; 2588 + sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv"; 2546 2589 type = "gem"; 2547 2590 }; 2548 - version = "3.3.3"; 2591 + version = "3.3.5"; 2549 2592 }; 2550 2593 redis-actionpack = { 2551 2594 dependencies = ["actionpack" "redis-rack" "redis-store"]; ··· 2778 2821 dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; 2779 2822 source = { 2780 2823 remotes = ["https://rubygems.org"]; 2781 - sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; 2824 + sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf"; 2782 2825 type = "gem"; 2783 2826 }; 2784 - version = "0.49.1"; 2827 + version = "0.52.1"; 2785 2828 }; 2786 2829 rubocop-gitlab-security = { 2787 2830 dependencies = ["rubocop"]; 2788 2831 source = { 2789 2832 remotes = ["https://rubygems.org"]; 2790 - sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy"; 2833 + sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; 2791 2834 type = "gem"; 2792 2835 }; 2793 - version = "0.1.0"; 2836 + version = "0.1.1"; 2794 2837 }; 2795 2838 rubocop-rspec = { 2796 2839 dependencies = ["rubocop"]; 2797 2840 source = { 2798 2841 remotes = ["https://rubygems.org"]; 2799 - sha256 = "16qgakivl2vqbx82fm78999cximbb10jbz3ix1ga4a2rns5xxlf3"; 2842 + sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx"; 2800 2843 type = "gem"; 2801 2844 }; 2802 - version = "1.15.1"; 2845 + version = "1.22.1"; 2803 2846 }; 2804 2847 ruby-fogbugz = { 2805 2848 dependencies = ["crack"]; ··· 2821 2864 ruby-progressbar = { 2822 2865 source = { 2823 2866 remotes = ["https://rubygems.org"]; 2824 - sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; 2867 + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; 2825 2868 type = "gem"; 2826 2869 }; 2827 - version = "1.8.1"; 2870 + version = "1.9.0"; 2828 2871 }; 2829 2872 ruby-saml = { 2830 2873 dependencies = ["nokogiri"]; ··· 2903 2946 version = "2.1.0"; 2904 2947 }; 2905 2948 sass = { 2949 + dependencies = ["sass-listen"]; 2906 2950 source = { 2907 2951 remotes = ["https://rubygems.org"]; 2908 - sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; 2952 + sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; 2909 2953 type = "gem"; 2910 2954 }; 2911 - version = "3.4.22"; 2955 + version = "3.5.5"; 2956 + }; 2957 + sass-listen = { 2958 + dependencies = ["rb-fsevent" "rb-inotify"]; 2959 + source = { 2960 + remotes = ["https://rubygems.org"]; 2961 + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; 2962 + type = "gem"; 2963 + }; 2964 + version = "4.0.0"; 2912 2965 }; 2913 2966 sass-rails = { 2914 2967 dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; ··· 2932 2985 dependencies = ["rake" "sass"]; 2933 2986 source = { 2934 2987 remotes = ["https://rubygems.org"]; 2935 - sha256 = "01lwbrz7637j79jkm6yaq4wsd4cqgzn0r74whn85v7j9dir73l98"; 2988 + sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; 2936 2989 type = "gem"; 2937 2990 }; 2938 - version = "0.54.0"; 2991 + version = "0.56.0"; 2939 2992 }; 2940 2993 securecompare = { 2941 2994 source = { ··· 2949 3002 dependencies = ["activerecord" "activesupport"]; 2950 3003 source = { 2951 3004 remotes = ["https://rubygems.org"]; 2952 - sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p"; 3005 + sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi"; 2953 3006 type = "gem"; 2954 3007 }; 2955 - version = "2.3.6"; 3008 + version = "2.3.7"; 2956 3009 }; 2957 3010 select2-rails = { 2958 3011 dependencies = ["thor"]; ··· 3019 3072 dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; 3020 3073 source = { 3021 3074 remotes = ["https://rubygems.org"]; 3022 - sha256 = "0nazi3a9aq7c7cxk749qz9ilp7dv39r9n3zsbjg4frc96bb85s9w"; 3075 + sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh"; 3023 3076 type = "gem"; 3024 3077 }; 3025 - version = "5.0.4"; 3078 + version = "5.0.5"; 3026 3079 }; 3027 3080 sidekiq-cron = { 3028 3081 dependencies = ["rufus-scheduler" "sidekiq"]; ··· 3537 3590 }; 3538 3591 version = "2.1.0"; 3539 3592 }; 3540 - } 3593 + }
+29 -33
pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
··· 1 1 diff --git a/config/environments/production.rb b/config/environments/production.rb 2 - index c5cbfcf64c..e40f10e25f 100644 2 + index c5cbfcf64c..4d01f6fab8 100644 3 3 --- a/config/environments/production.rb 4 4 +++ b/config/environments/production.rb 5 - @@ -70,14 +70,16 @@ Rails.application.configure do 5 + @@ -70,10 +70,10 @@ Rails.application.configure do 6 6 7 7 config.action_mailer.delivery_method = :sendmail 8 8 # Defaults to: ··· 11 11 - # # arguments: '-i -t' 12 12 - # # } 13 13 + config.action_mailer.sendmail_settings = { 14 - + location: '/run/wrappers/bin/sendmail', 14 + + location: '/usr/sbin/sendmail', 15 15 + arguments: '-i -t' 16 16 + } 17 17 config.action_mailer.perform_deliveries = true 18 18 config.action_mailer.raise_delivery_errors = true 19 19 20 - config.eager_load = true 21 - 22 - config.allow_concurrency = false 23 - + 24 - + config.active_record.dump_schema_after_migration = false 25 - end 26 20 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example 27 - index 0b33783869..cd4e41d9bd 100644 21 + index bd696a7f2c..44e3863736 100644 28 22 --- a/config/gitlab.yml.example 29 23 +++ b/config/gitlab.yml.example 30 - @@ -574,7 +574,7 @@ production: &base 24 + @@ -590,7 +590,7 @@ production: &base 31 25 # CAUTION! 32 26 # Use the default values unless you really know what you are doing 33 27 git: ··· 37 31 ## Webpack settings 38 32 # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running 39 33 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb 40 - index 8ddf8e4d2e..559cf9adf7 100644 34 + index 0bea8a4f4b..290248547b 100644 41 35 --- a/config/initializers/1_settings.rb 42 36 +++ b/config/initializers/1_settings.rb 43 - @@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git' 37 + @@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git' 44 38 Settings.gitlab['user_home'] ||= begin 45 39 Etc.getpwnam(Settings.gitlab['user']).dir 46 40 rescue ArgumentError # no user configured ··· 49 43 end 50 44 Settings.gitlab['time_zone'] ||= nil 51 45 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? 52 - @@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil 46 + @@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil 53 47 # Git 54 48 # 55 49 Settings['git'] ||= Settingslogic.new({}) ··· 58 52 59 53 # Important: keep the satellites.path setting until GitLab 9.0 at 60 54 # least. This setting is fed to 'rm -rf' in 55 + diff --git a/lib/api/api.rb b/lib/api/api.rb 56 + index e953f3d2ec..3a8d9f076b 100644 57 + --- a/lib/api/api.rb 58 + +++ b/lib/api/api.rb 59 + @@ -2,7 +2,7 @@ module API 60 + class API < Grape::API 61 + include APIGuard 62 + 63 + - LOG_FILENAME = Rails.root.join("log", "api_json.log") 64 + + LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") 65 + 66 + NO_SLASH_URL_PART_REGEX = %r{[^/]+} 67 + PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze 61 68 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb 62 - index 59b21149a9..4f4a39a06c 100644 69 + index a42e312b5d..ccaab9229e 100644 63 70 --- a/lib/gitlab/logger.rb 64 71 +++ b/lib/gitlab/logger.rb 65 - @@ -26,7 +26,7 @@ 72 + @@ -26,7 +26,7 @@ module Gitlab 66 73 end 67 74 68 75 def self.full_log_path 69 76 - Rails.root.join("log", file_name) 70 - + File.join(ENV["GITLAB_LOG_PATH"], file_name) 77 + + File.join(ENV["GITLAB_LOG_PATH"], file_name) 71 78 end 72 79 73 80 def self.cache_key 74 81 diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb 75 - index b5f4124052..f72c556983 100644 82 + index 7d7400bdab..cb25211d44 100644 76 83 --- a/lib/gitlab/uploads_transfer.rb 77 84 +++ b/lib/gitlab/uploads_transfer.rb 78 85 @@ -1,7 +1,7 @@ 79 86 module Gitlab 80 87 class UploadsTransfer < ProjectTransfer 81 88 def root_dir 82 - - File.join(CarrierWave.root, FileUploader.base_dir) 83 - + ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir) 89 + - FileUploader.root 90 + + ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root 84 91 end 85 92 end 86 93 end ··· 98 105 end 99 106 end 100 107 diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb 101 - index 7026d0ba07..6d88b8b9fb 100644 108 + index 7026d0ba07..c56e1f7ed9 100644 102 109 --- a/lib/system_check/app/uploads_directory_exists_check.rb 103 110 +++ b/lib/system_check/app/uploads_directory_exists_check.rb 104 111 @@ -4,12 +4,13 @@ module SystemCheck ··· 113 120 + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') 114 121 try_fixing_it( 115 122 - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" 116 - + "sudo -u #{gitlab_user} mkdir #{uploads_dir}" 123 + + "sudo -u #{gitlab_user} mkdir #{uploads_dir}" 117 124 ) 118 125 for_more_information( 119 126 see_installation_guide_section 'GitLab' ··· 143 150 end 144 151 end 145 152 end 146 - --- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100 147 - +++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200 148 - @@ -2,7 +2,7 @@ 149 - class API < Grape::API 150 - include APIGuard 151 - 152 - - LOG_FILENAME = Rails.root.join("log", "api_json.log") 153 - + LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") 154 - 155 - use GrapeLogging::Middleware::RequestLogger, 156 - logger: Logger.new(LOG_FILENAME),