commit 1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b · pyrox.dev/nixpkgs

+13 -11

pkgs/applications/version-management/gitlab/Gemfile

···

       1
       1
        
       source 'https://rubygems.org'

     

       2
       2
        
       

     

       3
       3
       -
       gem 'rails', '4.2.8'

     

       3
       3
       +
       gem 'rails', '4.2.10'

     

       4
       4
        
       gem 'rails-deprecated_sanitizer', '~> 1.0.3'

     

       5
       5
        
       

     

       6
       6
        
       # Responders respond_to and respond_with

     
···

       90
       90
        
       gem 'hamlit', '~> 2.6.1'

     

       91
       91
        
       

     

       92
       92
        
       # Files attachments

     

       93
       93
       -
       gem 'carrierwave', '~> 1.1'

     

       93
       93
       +
       gem 'carrierwave', '~> 1.2'

     

       94
       94
        
       

     

       95
       95
        
       # Drag and Drop UI

     

       96
       96
        
       gem 'dropzonejs-rails', '~> 0.7.1'

     
···

       102
       102
        
       gem 'fog-local', '~> 0.3'

     

       103
       103
        
       gem 'fog-openstack', '~> 0.1'

     

       104
       104
        
       gem 'fog-rackspace', '~> 0.1.1'

     

       105
       105
       -
       gem 'fog-aliyun', '~> 0.1.0'

     

       105
       105
       +
       gem 'fog-aliyun', '~> 0.2.0'

     

       106
       106
        
       

     

       107
       107
        
       # for Google storage

     

       108
       108
        
       gem 'google-api-client', '~> 0.13.6'

     
···

       111
       111
        
       gem 'unf', '~> 0.1.4'

     

       112
       112
        
       

     

       113
       113
        
       # Seed data

     

       114
       114
       -
       gem 'seed-fu', '~> 2.3.5'

     

       114
       114
       +
       gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved

     

       115
       115
        
       

     

       116
       116
        
       # Markdown and HTML processing

     

       117
       117
        
       gem 'html-pipeline', '~> 1.11.0'

     
···

       171
       171
        
       gem 'version_sorter', '~> 2.1.0'

     

       172
       172
        
       

     

       173
       173
        
       # Cache

     

       174
       174
       -
       gem 'redis-rails', '~> 5.0.1'

     

       174
       174
       +
       gem 'redis-rails', '~> 5.0.2'

     

       175
       175
        
       

     

       176
       176
        
       # Redis

     

       177
       177
        
       gem 'redis', '~> 3.2'

     
···

       245
       245
        
       gem 'gemojione', '~> 3.3'

     

       246
       246
        
       gem 'gon', '~> 6.1.0'

     

       247
       247
        
       gem 'jquery-atwho-rails', '~> 1.3.2'

     

       248
       248
       -
       gem 'jquery-rails', '~> 4.1.0'

     

       248
       248
       +
       gem 'jquery-rails', '~> 4.3.1'

     

       249
       249
        
       gem 'request_store', '~> 1.3'

     

       250
       250
        
       gem 'select2-rails', '~> 3.5.9'

     

       251
       251
        
       gem 'virtus', '~> 1.0.1'

     
···

       263
       263
        
       gem 'gettext_i18n_rails_js', '~> 1.2.0'

     

       264
       264
        
       gem 'gettext', '~> 3.2.2', require: false, group: :development

     

       265
       265
        
       

     

       266
       266
       +
       gem 'batch-loader'

     

       267
       267
       +
       

     

       266
       268
        
       # Perf bar

     

       267
       269
        
       gem 'peek', '~> 1.0.1'

     

       268
       270
        
       gem 'peek-gc', '~> 0.0.2'

     
···

       281
       283
        
         gem 'influxdb', '~> 0.2', require: false

     

       282
       284
        
       

     

       283
       285
        
         # Prometheus

     

       284
       284
       -
         gem 'prometheus-client-mmap', '~>0.7.0.beta18'

     

       286
       286
       +
         gem 'prometheus-client-mmap', '~> 0.7.0.beta43'

     

       285
       287
        
         gem 'raindrops', '~> 0.18'

     

       286
       288
        
       end

     

       287
       289
        
       

     
···

       324
       326
        
         # Generate Fake data

     

       325
       327
        
         gem 'ffaker', '~> 2.4'

     

       326
       328
        
       

     

       327
       327
       -
         gem 'capybara', '~> 2.15.0'

     

       329
       329
       +
         gem 'capybara', '~> 2.15'

     

       328
       330
        
         gem 'capybara-screenshot', '~> 1.0.0'

     

       329
       329
       -
         gem 'poltergeist', '~> 1.9.0'

     

       331
       331
       +
         gem 'selenium-webdriver', '~> 3.5'

     

       330
       332
        
       

     

       331
       333
        
         gem 'spring', '~> 2.0.0'

     

       332
       334
        
         gem 'spring-commands-rspec', '~> 1.0.4'

     
···

       343
       345
        
       

     

       344
       346
        
         gem 'benchmark-ips', '~> 2.3.0', require: false

     

       345
       347
        
       

     

       346
       346
       -
         gem 'license_finder', '~> 2.1.0', require: false

     

       348
       348
       +
         gem 'license_finder', '~> 3.1', require: false

     

       347
       349
        
         gem 'knapsack', '~> 1.11.0'

     

       348
       350
        
       

     

       349
       351
        
         gem 'activerecord_sane_schema_dumper', '0.2'

     
···

       398
       400
        
       end

     

       399
       401
        
       

     

       400
       402
        
       # Gitaly GRPC client

     

       401
       401
       -
       gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'

     

       403
       403
       +
       gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'

     

       402
       404
        
       

     

       403
       405
        
       gem 'toml-rb', '~> 0.3.15', require: false

     

       404
       406

+89 -84

pkgs/applications/version-management/gitlab/Gemfile.lock

···

       4
       4
        
           RedCloth (4.3.2)

     

       5
       5
        
           abstract_type (0.0.7)

     

       6
       6
        
           ace-rails-ap (4.1.2)

     

       7
       7
       -
           actionmailer (4.2.8)

     

       8
       8
       -
             actionpack (= 4.2.8)

     

       9
       9
       -
             actionview (= 4.2.8)

     

       10
       10
       -
             activejob (= 4.2.8)

     

       7
       7
       +
           actionmailer (4.2.10)

     

       8
       8
       +
             actionpack (= 4.2.10)

     

       9
       9
       +
             actionview (= 4.2.10)

     

       10
       10
       +
             activejob (= 4.2.10)

     

       11
       11
        
             mail (~> 2.5, >= 2.5.4)

     

       12
       12
        
             rails-dom-testing (~> 1.0, >= 1.0.5)

     

       13
       13
       -
           actionpack (4.2.8)

     

       14
       14
       -
             actionview (= 4.2.8)

     

       15
       15
       -
             activesupport (= 4.2.8)

     

       13
       13
       +
           actionpack (4.2.10)

     

       14
       14
       +
             actionview (= 4.2.10)

     

       15
       15
       +
             activesupport (= 4.2.10)

     

       16
       16
        
             rack (~> 1.6)

     

       17
       17
        
             rack-test (~> 0.6.2)

     

       18
       18
        
             rails-dom-testing (~> 1.0, >= 1.0.5)

     

       19
       19
        
             rails-html-sanitizer (~> 1.0, >= 1.0.2)

     

       20
       20
       -
           actionview (4.2.8)

     

       21
       21
       -
             activesupport (= 4.2.8)

     

       20
       20
       +
           actionview (4.2.10)

     

       21
       21
       +
             activesupport (= 4.2.10)

     

       22
       22
        
             builder (~> 3.1)

     

       23
       23
        
             erubis (~> 2.7.0)

     

       24
       24
        
             rails-dom-testing (~> 1.0, >= 1.0.5)

     

       25
       25
        
             rails-html-sanitizer (~> 1.0, >= 1.0.3)

     

       26
       26
       -
           activejob (4.2.8)

     

       27
       27
       -
             activesupport (= 4.2.8)

     

       26
       26
       +
           activejob (4.2.10)

     

       27
       27
       +
             activesupport (= 4.2.10)

     

       28
       28
        
             globalid (>= 0.3.0)

     

       29
       29
       -
           activemodel (4.2.8)

     

       30
       30
       -
             activesupport (= 4.2.8)

     

       29
       29
       +
           activemodel (4.2.10)

     

       30
       30
       +
             activesupport (= 4.2.10)

     

       31
       31
        
             builder (~> 3.1)

     

       32
       32
       -
           activerecord (4.2.8)

     

       33
       33
       -
             activemodel (= 4.2.8)

     

       34
       34
       -
             activesupport (= 4.2.8)

     

       32
       32
       +
           activerecord (4.2.10)

     

       33
       33
       +
             activemodel (= 4.2.10)

     

       34
       34
       +
             activesupport (= 4.2.10)

     

       35
       35
        
             arel (~> 6.0)

     

       36
       36
        
           activerecord-nulldb-adapter (0.3.7)

     

       37
       37
        
             activerecord (>= 2.0.0)

     

       38
       38
        
           activerecord_sane_schema_dumper (0.2)

     

       39
       39
        
             rails (>= 4, < 5)

     

       40
       40
       -
           activesupport (4.2.8)

     

       40
       40
       +
           activesupport (4.2.10)

     

       41
       41
        
             i18n (~> 0.7)

     

       42
       42
        
             minitest (~> 5.1)

     

       43
       43
        
             thread_safe (~> 0.3, >= 0.3.4)

     
···

       75
       75
        
             thread_safe (~> 0.3, >= 0.3.1)

     

       76
       76
        
           babosa (1.0.2)

     

       77
       77
        
           base32 (0.3.2)

     

       78
       78
       +
           batch-loader (1.1.1)

     

       78
       79
        
           bcrypt (3.1.11)

     

       79
       80
        
           bcrypt_pbkdf (1.0.0)

     

       80
       81
        
           benchmark-ips (2.3.0)

     
···

       85
       86
        
           bindata (2.4.1)

     

       86
       87
        
           binding_of_caller (0.7.2)

     

       87
       88
        
             debug_inspector (>= 0.0.1)

     

       89
       89
       +
           blankslate (2.1.2.4)

     

       88
       90
        
           bootstrap-sass (3.3.6)

     

       89
       91
        
             autoprefixer-rails (>= 5.2.1)

     

       90
       92
        
             sass (>= 3.3.4)

     
···

       109
       111
        
           capybara-screenshot (1.0.14)

     

       110
       112
        
             capybara (>= 1.0, < 3)

     

       111
       113
        
             launchy

     

       112
       112
       -
           carrierwave (1.1.0)

     

       114
       114
       +
           carrierwave (1.2.1)

     

       113
       115
        
             activemodel (>= 4.0.0)

     

       114
       116
        
             activesupport (>= 4.0.0)

     

       115
       117
        
             mime-types (>= 1.16)

     

       116
       118
        
           cause (0.1)

     

       117
       119
        
           charlock_holmes (0.7.5)

     

       120
       120
       +
           childprocess (0.7.0)

     

       121
       121
       +
             ffi (~> 1.0, >= 1.0.11)

     

       118
       122
        
           chronic (0.10.2)

     

       119
       123
        
           chronic_duration (0.10.6)

     

       120
       124
        
             numerizer (~> 0.1.1)

     

       121
       125
        
           chunky_png (1.3.5)

     

       122
       126
        
           citrus (3.0.2)

     

       123
       123
       -
           cliver (0.3.2)

     

       124
       127
        
           coderay (1.1.1)

     

       125
       128
        
           coercible (1.0.0)

     

       126
       129
        
             descendants_tracker (~> 0.0.1)

     
···

       216
       219
        
           flowdock (0.7.1)

     

       217
       220
        
             httparty (~> 0.7)

     

       218
       221
        
             multi_json

     

       219
       219
       -
           fog-aliyun (0.1.0)

     

       222
       222
       +
           fog-aliyun (0.2.0)

     

       220
       223
        
             fog-core (~> 1.27)

     

       221
       224
        
             fog-json (~> 1.0)

     

       222
       225
        
             ipaddress (~> 0.8)

     
···

       275
       278
        
             po_to_json (>= 1.0.0)

     

       276
       279
        
             rails (>= 3.2.0)

     

       277
       280
        
           gherkin-ruby (0.3.2)

     

       278
       278
       -
           gitaly-proto (0.39.0)

     

       281
       281
       +
           gitaly-proto (0.59.0)

     

       279
       282
        
             google-protobuf (~> 3.1)

     

       280
       283
        
             grpc (~> 1.0)

     

       281
       284
        
           github-linguist (4.7.6)

     
···

       293
       296
        
             diff-lcs (~> 1.1)

     

       294
       297
        
             mime-types (>= 1.16)

     

       295
       298
        
             posix-spawn (~> 0.3)

     

       296
       296
       -
           gitlab-markup (1.6.2)

     

       299
       299
       +
           gitlab-markup (1.6.3)

     

       297
       300
        
           gitlab_omniauth-ldap (2.0.4)

     

       298
       301
        
             net-ldap (~> 0.16)

     

       299
       302
        
             omniauth (~> 1.3)

     

       300
       303
        
             pyu-ruby-sasl (>= 0.0.3.3, < 0.1)

     

       301
       304
        
             rubyntlm (~> 0.5)

     

       302
       302
       -
           globalid (0.3.7)

     

       303
       303
       -
             activesupport (>= 4.1.0)

     

       305
       305
       +
           globalid (0.4.1)

     

       306
       306
       +
             activesupport (>= 4.2.0)

     

       304
       307
        
           gollum-grit_adapter (1.0.1)

     

       305
       308
        
             gitlab-grit (~> 2.7, >= 2.7.1)

     

       306
       309
        
           gollum-lib (4.2.7)

     
···

       326
       329
        
             mime-types (~> 3.0)

     

       327
       330
        
             representable (~> 3.0)

     

       328
       331
        
             retriable (>= 2.0, < 4.0)

     

       329
       329
       -
           google-protobuf (3.4.0.2)

     

       332
       332
       +
           google-protobuf (3.4.1.1)

     

       330
       333
        
           googleauth (0.5.3)

     

       331
       334
        
             faraday (~> 0.12)

     

       332
       335
        
             jwt (~> 1.4)

     
···

       353
       356
        
             rake

     

       354
       357
        
           grape_logging (1.7.0)

     

       355
       358
        
             grape

     

       356
       356
       -
           grpc (1.6.0)

     

       359
       359
       +
           grpc (1.4.5)

     

       357
       360
        
             google-protobuf (~> 3.1)

     

       358
       361
        
             googleauth (~> 0.5.1)

     

       359
       362
        
           haml (4.0.7)

     
···

       396
       399
        
             json (~> 1.8)

     

       397
       400
        
             multi_xml (>= 0.5.2)

     

       398
       401
        
           httpclient (2.8.2)

     

       399
       399
       -
           i18n (0.8.6)

     

       402
       402
       +
           i18n (0.9.1)

     

       403
       403
       +
             concurrent-ruby (~> 1.0)

     

       400
       404
        
           ice_nine (0.11.2)

     

       401
       405
        
           influxdb (0.2.3)

     

       402
       406
        
             cause

     
···

       407
       411
        
             multipart-post

     

       408
       412
        
             oauth (~> 0.5, >= 0.5.0)

     

       409
       413
        
           jquery-atwho-rails (1.3.2)

     

       410
       410
       -
           jquery-rails (4.1.1)

     

       414
       414
       +
           jquery-rails (4.3.1)

     

       411
       415
        
             rails-dom-testing (>= 1, < 3)

     

       412
       416
        
             railties (>= 4.2.0)

     

       413
       417
        
             thor (>= 0.14, < 2.0)

     
···

       449
       453
        
             actionmailer (>= 3.2)

     

       450
       454
        
             letter_opener (~> 1.0)

     

       451
       455
        
             railties (>= 3.2)

     

       452
       452
       -
           license_finder (2.1.0)

     

       456
       456
       +
           license_finder (3.1.1)

     

       453
       457
        
             bundler

     

       454
       458
        
             httparty

     

       455
       459
        
             rubyzip

     

       456
       460
        
             thor

     

       461
       461
       +
             toml (= 0.1.2)

     

       462
       462
       +
             with_env (> 1.0)

     

       457
       463
        
             xml-simple

     

       458
       464
        
           licensee (8.7.0)

     

       459
       465
        
             rugged (~> 0.24)

     
···

       468
       474
        
             railties (>= 4, < 5.2)

     

       469
       475
        
           loofah (2.0.3)

     

       470
       476
        
             nokogiri (>= 1.5.9)

     

       471
       471
       -
           mail (2.6.6)

     

       472
       472
       -
             mime-types (>= 1.16, < 4)

     

       477
       477
       +
           mail (2.7.0)

     

       478
       478
       +
             mini_mime (>= 0.1.1)

     

       473
       479
        
           mail_room (0.9.1)

     

       474
       480
        
           memoist (0.16.0)

     

       475
       481
        
           memoizable (0.4.2)

     
···

       482
       488
        
           mini_mime (0.1.4)

     

       483
       489
        
           mini_portile2 (2.3.0)

     

       484
       490
        
           minitest (5.7.0)

     

       485
       485
       -
           mmap2 (2.2.7)

     

       486
       491
        
           mousetrap-rails (1.4.6)

     

       487
       492
        
           multi_json (1.12.2)

     

       488
       493
        
           multi_xml (0.6.0)

     
···

       567
       572
        
           parallel (1.12.0)

     

       568
       573
        
           paranoia (2.3.1)

     

       569
       574
        
             activerecord (>= 4.0, < 5.2)

     

       570
       570
       -
           parser (2.4.0.0)

     

       571
       571
       -
             ast (~> 2.2)

     

       575
       575
       +
           parser (2.4.0.2)

     

       576
       576
       +
             ast (~> 2.3)

     

       577
       577
       +
           parslet (1.5.0)

     

       578
       578
       +
             blankslate (~> 2.0)

     

       572
       579
        
           path_expander (1.0.1)

     

       573
       580
        
           peek (1.0.1)

     

       574
       581
        
             concurrent-ruby (>= 0.9.0)

     
···

       603
       610
        
           pg (0.18.4)

     

       604
       611
        
           po_to_json (1.0.1)

     

       605
       612
        
             json (>= 1.6.0)

     

       606
       606
       -
           poltergeist (1.9.0)

     

       607
       607
       -
             capybara (~> 2.1)

     

       608
       608
       -
             cliver (~> 0.3.1)

     

       609
       609
       -
             multi_json (~> 1.0)

     

       610
       610
       -
             websocket-driver (>= 0.2.0)

     

       611
       613
        
           posix-spawn (0.3.13)

     

       612
       614
        
           powerpack (0.1.1)

     

       613
       615
        
           premailer (1.10.4)

     
···

       622
       624
        
             parser

     

       623
       625
        
             unparser

     

       624
       626
        
           procto (0.0.3)

     

       625
       625
       -
           prometheus-client-mmap (0.7.0.beta18)

     

       626
       626
       -
             mmap2 (~> 2.2, >= 2.2.7)

     

       627
       627
       +
           prometheus-client-mmap (0.7.0.beta43)

     

       627
       628
        
           pry (0.10.4)

     

       628
       629
        
             coderay (~> 1.1.0)

     

       629
       630
        
             method_source (~> 0.8.1)

     
···

       653
       654
        
             rack

     

       654
       655
        
           rack-test (0.6.3)

     

       655
       656
        
             rack (>= 1.0)

     

       656
       656
       -
           rails (4.2.8)

     

       657
       657
       -
             actionmailer (= 4.2.8)

     

       658
       658
       -
             actionpack (= 4.2.8)

     

       659
       659
       -
             actionview (= 4.2.8)

     

       660
       660
       -
             activejob (= 4.2.8)

     

       661
       661
       -
             activemodel (= 4.2.8)

     

       662
       662
       -
             activerecord (= 4.2.8)

     

       663
       663
       -
             activesupport (= 4.2.8)

     

       657
       657
       +
           rails (4.2.10)

     

       658
       658
       +
             actionmailer (= 4.2.10)

     

       659
       659
       +
             actionpack (= 4.2.10)

     

       660
       660
       +
             actionview (= 4.2.10)

     

       661
       661
       +
             activejob (= 4.2.10)

     

       662
       662
       +
             activemodel (= 4.2.10)

     

       663
       663
       +
             activerecord (= 4.2.10)

     

       664
       664
       +
             activesupport (= 4.2.10)

     

       664
       665
        
             bundler (>= 1.3.0, < 2.0)

     

       665
       665
       -
             railties (= 4.2.8)

     

       666
       666
       +
             railties (= 4.2.10)

     

       666
       667
        
             sprockets-rails

     

       667
       668
        
           rails-deprecated_sanitizer (1.0.3)

     

       668
       669
        
             activesupport (>= 4.2.0.alpha)

     
···

       675
       676
        
           rails-i18n (4.0.9)

     

       676
       677
        
             i18n (~> 0.7)

     

       677
       678
        
             railties (~> 4.0)

     

       678
       678
       -
           railties (4.2.8)

     

       679
       679
       -
             actionpack (= 4.2.8)

     

       680
       680
       -
             activesupport (= 4.2.8)

     

       679
       679
       +
           railties (4.2.10)

     

       680
       680
       +
             actionpack (= 4.2.10)

     

       681
       681
       +
             activesupport (= 4.2.10)

     

       681
       682
        
             rake (>= 0.8.7)

     

       682
       683
        
             thor (>= 0.18.1, < 2.0)

     

       683
       684
        
           rainbow (2.2.2)

     

       684
       685
        
             rake

     

       685
       686
        
           raindrops (0.18.0)

     

       686
       686
       -
           rake (12.1.0)

     

       687
       687
       +
           rake (12.3.0)

     

       687
       688
        
           rblineprof (0.3.6)

     

       688
       689
        
             debugger-ruby_core_source (~> 1.3)

     

       689
       690
        
           rbnacl (4.0.2)

     
···

       698
       699
        
           recursive-open-struct (1.0.0)

     

       699
       700
        
           redcarpet (3.4.0)

     

       700
       701
        
           redis (3.3.3)

     

       701
       701
       -
           redis-actionpack (5.0.1)

     

       702
       702
       +
           redis-actionpack (5.0.2)

     

       702
       703
        
             actionpack (>= 4.0, < 6)

     

       703
       704
        
             redis-rack (>= 1, < 3)

     

       704
       704
       -
             redis-store (>= 1.1.0, < 1.4.0)

     

       705
       705
       -
           redis-activesupport (5.0.1)

     

       705
       705
       +
             redis-store (>= 1.1.0, < 2)

     

       706
       706
       +
           redis-activesupport (5.0.4)

     

       706
       707
        
             activesupport (>= 3, < 6)

     

       707
       707
       -
             redis-store (~> 1.2.0)

     

       708
       708
       +
             redis-store (>= 1.3, < 2)

     

       708
       709
        
           redis-namespace (1.5.2)

     

       709
       710
        
             redis (~> 3.0, >= 3.0.4)

     

       710
       710
       -
           redis-rack (1.6.0)

     

       711
       711
       -
             rack (~> 1.5)

     

       712
       712
       -
             redis-store (~> 1.2.0)

     

       713
       713
       -
           redis-rails (5.0.1)

     

       714
       714
       -
             redis-actionpack (~> 5.0.0)

     

       715
       715
       -
             redis-activesupport (~> 5.0.0)

     

       716
       716
       -
             redis-store (~> 1.2.0)

     

       717
       717
       -
           redis-store (1.2.0)

     

       718
       718
       -
             redis (>= 2.2)

     

       711
       711
       +
           redis-rack (2.0.4)

     

       712
       712
       +
             rack (>= 1.5, < 3)

     

       713
       713
       +
             redis-store (>= 1.2, < 2)

     

       714
       714
       +
           redis-rails (5.0.2)

     

       715
       715
       +
             redis-actionpack (>= 5.0, < 6)

     

       716
       716
       +
             redis-activesupport (>= 5.0, < 6)

     

       717
       717
       +
             redis-store (>= 1.2, < 2)

     

       718
       718
       +
           redis-store (1.4.1)

     

       719
       719
       +
             redis (>= 2.2, < 5)

     

       719
       720
        
           representable (3.0.4)

     

       720
       721
        
             declarative (< 0.1.0)

     

       721
       722
        
             declarative-option (< 0.2.0)

     
···

       817
       818
        
             activesupport (>= 3.1)

     

       818
       819
        
           select2-rails (3.5.9.3)

     

       819
       820
        
             thor (~> 0.14)

     

       821
       821
       +
           selenium-webdriver (3.5.0)

     

       822
       822
       +
             childprocess (~> 0.5)

     

       823
       823
       +
             rubyzip (~> 1.0)

     

       820
       824
        
           sentry-raven (2.5.3)

     

       821
       825
        
             faraday (>= 0.7.6, < 1.0)

     

       822
       826
        
           settingslogic (2.0.9)

     
···

       867
       871
        
           sprockets (3.7.1)

     

       868
       872
        
             concurrent-ruby (~> 1.0)

     

       869
       873
        
             rack (> 1, < 3)

     

       870
       870
       -
           sprockets-rails (3.2.0)

     

       874
       874
       +
           sprockets-rails (3.2.1)

     

       871
       875
        
             actionpack (>= 4.0)

     

       872
       876
        
             activesupport (>= 4.0)

     

       873
       877
        
             sprockets (>= 3.0.0)

     
···

       898
       902
        
           tilt (2.0.6)

     

       899
       903
        
           timecop (0.8.1)

     

       900
       904
        
           timfel-krb5-auth (0.8.3)

     

       905
       905
       +
           toml (0.1.2)

     

       906
       906
       +
             parslet (~> 1.5.0)

     

       901
       907
        
           toml-rb (0.3.15)

     

       902
       908
        
             citrus (~> 3.0, > 3.0)

     

       903
       909
        
           truncato (0.7.10)

     

       904
       910
        
             htmlentities (~> 4.3.1)

     

       905
       911
        
             nokogiri (~> 1.8.0, >= 1.7.0)

     

       906
       906
       -
           tzinfo (1.2.3)

     

       912
       912
       +
           tzinfo (1.2.4)

     

       907
       913
        
             thread_safe (~> 0.1)

     

       908
       914
        
           u2f (0.2.1)

     

       909
       915
        
           uber (0.1.0)

     
···

       948
       954
        
             hashdiff

     

       949
       955
        
           webpack-rails (0.9.10)

     

       950
       956
        
             railties (>= 3.2.0)

     

       951
       951
       -
           websocket-driver (0.6.3)

     

       952
       952
       -
             websocket-extensions (>= 0.1.0)

     

       953
       953
       -
           websocket-extensions (0.1.2)

     

       954
       957
        
           wikicloth (0.8.1)

     

       955
       958
        
             builder

     

       956
       959
        
             expression_parser

     

       957
       960
        
             rinku

     

       961
       961
       +
           with_env (1.1.0)

     

       958
       962
        
           xml-simple (1.1.5)

     

       959
       963
        
           xpath (2.1.0)

     

       960
       964
        
             nokogiri (~> 1.3)

     
···

       978
       982
        
         awesome_print (~> 1.2.0)

     

       979
       983
        
         babosa (~> 1.0.2)

     

       980
       984
        
         base32 (~> 0.3.0)

     

       985
       985
       +
         batch-loader

     

       981
       986
        
         bcrypt_pbkdf (~> 1.0)

     

       982
       987
        
         benchmark-ips (~> 2.3.0)

     

       983
       988
        
         better_errors (~> 2.1.0)

     
···

       988
       993
        
         browser (~> 2.2)

     

       989
       994
        
         bullet (~> 5.5.0)

     

       990
       995
        
         bundler-audit (~> 0.5.0)

     

       991
       991
       -
         capybara (~> 2.15.0)

     

       996
       996
       +
         capybara (~> 2.15)

     

       992
       997
        
         capybara-screenshot (~> 1.0.0)

     

       993
       993
       -
         carrierwave (~> 1.1)

     

       998
       998
       +
         carrierwave (~> 1.2)

     

       994
       999
        
         charlock_holmes (~> 0.7.5)

     

       995
       1000
        
         chronic (~> 0.10.2)

     

       996
       1001
        
         chronic_duration (~> 0.10.6)

     
···

       1015
       1020
        
         flay (~> 2.8.0)

     

       1016
       1021
        
         flipper (~> 0.10.2)

     

       1017
       1022
        
         flipper-active_record (~> 0.10.2)

     

       1018
       1018
       -
         fog-aliyun (~> 0.1.0)

     

       1023
       1023
       +
         fog-aliyun (~> 0.2.0)

     

       1019
       1024
        
         fog-aws (~> 1.4)

     

       1020
       1025
        
         fog-core (~> 1.44)

     

       1021
       1026
        
         fog-google (~> 0.5)

     
···

       1030
       1035
        
         gettext (~> 3.2.2)

     

       1031
       1036
        
         gettext_i18n_rails (~> 1.8.0)

     

       1032
       1037
        
         gettext_i18n_rails_js (~> 1.2.0)

     

       1033
       1033
       -
         gitaly-proto (~> 0.39.0)

     

       1038
       1038
       +
         gitaly-proto (~> 0.59.0)

     

       1034
       1039
        
         github-linguist (~> 4.7.0)

     

       1035
       1040
        
         gitlab-flowdock-git-hook (~> 1.0.1)

     

       1036
       1041
        
         gitlab-markup (~> 1.6.2)

     
···

       1055
       1060
        
         influxdb (~> 0.2)

     

       1056
       1061
        
         jira-ruby (~> 1.4)

     

       1057
       1062
        
         jquery-atwho-rails (~> 1.3.2)

     

       1058
       1058
       -
         jquery-rails (~> 4.1.0)

     

       1063
       1063
       +
         jquery-rails (~> 4.3.1)

     

       1059
       1064
        
         json-schema (~> 2.8.0)

     

       1060
       1065
        
         jwt (~> 1.5.6)

     

       1061
       1066
        
         kaminari (~> 1.0)

     

       1062
       1067
        
         knapsack (~> 1.11.0)

     

       1063
       1068
        
         kubeclient (~> 2.2.0)

     

       1064
       1069
        
         letter_opener_web (~> 1.3.0)

     

       1065
       1065
       -
         license_finder (~> 2.1.0)

     

       1070
       1070
       +
         license_finder (~> 3.1)

     

       1066
       1071
        
         licensee (~> 8.7.0)

     

       1067
       1072
        
         lograge (~> 0.5)

     

       1068
       1073
        
         loofah (~> 2.0.3)

     
···

       1104
       1109
        
         peek-redis (~> 1.2.0)

     

       1105
       1110
        
         peek-sidekiq (~> 1.0.3)

     

       1106
       1111
        
         pg (~> 0.18.2)

     

       1107
       1107
       -
         poltergeist (~> 1.9.0)

     

       1108
       1112
        
         premailer-rails (~> 1.9.7)

     

       1109
       1109
       -
         prometheus-client-mmap (~> 0.7.0.beta18)

     

       1113
       1113
       +
         prometheus-client-mmap (~> 0.7.0.beta43)

     

       1110
       1114
        
         pry-byebug (~> 3.4.1)

     

       1111
       1115
        
         pry-rails (~> 0.3.4)

     

       1112
       1116
        
         rack-attack (~> 4.4.1)

     

       1113
       1117
        
         rack-cors (~> 0.4.0)

     

       1114
       1118
        
         rack-oauth2 (~> 1.2.1)

     

       1115
       1119
        
         rack-proxy (~> 0.6.0)

     

       1116
       1116
       -
         rails (= 4.2.8)

     

       1120
       1120
       +
         rails (= 4.2.10)

     

       1117
       1121
        
         rails-deprecated_sanitizer (~> 1.0.3)

     

       1118
       1122
        
         rails-i18n (~> 4.0.9)

     

       1119
       1123
        
         rainbow (~> 2.2)

     
···

       1127
       1131
        
         redcarpet (~> 3.4)

     

       1128
       1132
        
         redis (~> 3.2)

     

       1129
       1133
        
         redis-namespace (~> 1.5.2)

     

       1130
       1130
       -
         redis-rails (~> 5.0.1)

     

       1134
       1134
       +
         redis-rails (~> 5.0.2)

     

       1131
       1135
        
         request_store (~> 1.3)

     

       1132
       1136
        
         responders (~> 2.0)

     

       1133
       1137
        
         rouge (~> 2.0)

     
···

       1148
       1152
        
         sanitize (~> 2.0)

     

       1149
       1153
        
         sass-rails (~> 5.0.6)

     

       1150
       1154
        
         scss_lint (~> 0.54.0)

     

       1151
       1151
       -
         seed-fu (~> 2.3.5)

     

       1155
       1155
       +
         seed-fu (= 2.3.6)

     

       1152
       1156
        
         select2-rails (~> 3.5.9)

     

       1157
       1157
       +
         selenium-webdriver (~> 3.5)

     

       1153
       1158
        
         sentry-raven (~> 2.5.3)

     

       1154
       1159
        
         settingslogic (~> 2.0.9)

     

       1155
       1160
        
         sham_rack (~> 1.3.6)

     
···

       1189
       1194
        
         wikicloth (= 0.8.1)

     

       1190
       1195
        
       

     

       1191
       1196
        
       BUNDLED WITH

     

       1192
       1192
       -
          1.15.4

     

       1197
       1197
       +
          1.16.0

+12 -8

pkgs/applications/version-management/gitlab/default.nix

···

       18
       18
        
           };

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         version = "10.1.1";

     

       21
       21
       +
         version = "10.3.3";

     

       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
       25
       -
           sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";

     

       25
       25
       +
           sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
       in

     
···

       30
       30
        
       stdenv.mkDerivation rec {

     

       31
       31
        
         name = "gitlab-${version}";

     

       32
       32
        
       

     

       33
       33
       -
         buildInputs = [

     

       34
       34
       -
           rubyEnv ruby bundler tzdata git procps dpkg nettools

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       33
        
         src = fetchFromGitHub {

     

       38
       34
        
           owner = "gitlabhq";

     

       39
       35
        
           repo = "gitlabhq";

     

       40
       36
        
           rev = "v${version}";

     

       41
       41
       -
           sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";

     

       37
       37
       +
           sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k";

     

       42
       38
        
         };

     

       39
       39
       +
       

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           rubyEnv ruby bundler tzdata git procps dpkg nettools

     

       42
       42
       +
         ];

     

       43
       43
        
       

     

       44
       44
        
         patches = [

     

       45
       45
        
           ./remove-hardcoded-locations.patch

     
···

       74
       74
        
         buildPhase = ''

     

       75
       75
        
           mv config/gitlab.yml.example config/gitlab.yml

     

       76
       76
        
       

     

       77
       77
       -
           dpkg -x ${gitlabDeb} .

     

       77
       77
       +
           # work around unpacking deb containing binary with suid bit

     

       78
       78
       +
           ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar

     

       79
       79
       +
           tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu

     

       80
       80
       +
           tar -xf gitlab-deb-data.tar

     

       81
       81
       +
       

     

       78
       82
        
           mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public

     

       79
       83
        
           rm -rf opt

     

       80
       84

+123 -105

pkgs/applications/version-management/gitlab/gemset.nix

···

       19
       19
        
           dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];

     

       20
       20
        
           source = {

     

       21
       21
        
             remotes = ["https://rubygems.org"];

     

       22
       22
       -
             sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q";

     

       22
       22
       +
             sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59";

     

       23
       23
        
             type = "gem";

     

       24
       24
        
           };

     

       25
       25
       -
           version = "4.2.8";

     

       25
       25
       +
           version = "4.2.10";

     

       26
       26
        
         };

     

       27
       27
        
         actionpack = {

     

       28
       28
        
           dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

     

       29
       29
        
           source = {

     

       30
       30
        
             remotes = ["https://rubygems.org"];

     

       31
       31
       -
             sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";

     

       31
       31
       +
             sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx";

     

       32
       32
        
             type = "gem";

     

       33
       33
        
           };

     

       34
       34
       -
           version = "4.2.8";

     

       34
       34
       +
           version = "4.2.10";

     

       35
       35
        
         };

     

       36
       36
        
         actionview = {

     

       37
       37
        
           dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];

     

       38
       38
        
           source = {

     

       39
       39
        
             remotes = ["https://rubygems.org"];

     

       40
       40
       -
             sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";

     

       40
       40
       +
             sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv";

     

       41
       41
        
             type = "gem";

     

       42
       42
        
           };

     

       43
       43
       -
           version = "4.2.8";

     

       43
       43
       +
           version = "4.2.10";

     

       44
       44
        
         };

     

       45
       45
        
         activejob = {

     

       46
       46
        
           dependencies = ["activesupport" "globalid"];

     

       47
       47
        
           source = {

     

       48
       48
        
             remotes = ["https://rubygems.org"];

     

       49
       49
       -
             sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz";

     

       49
       49
       +
             sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8";

     

       50
       50
        
             type = "gem";

     

       51
       51
        
           };

     

       52
       52
       -
           version = "4.2.8";

     

       52
       52
       +
           version = "4.2.10";

     

       53
       53
        
         };

     

       54
       54
        
         activemodel = {

     

       55
       55
        
           dependencies = ["activesupport" "builder"];

     

       56
       56
        
           source = {

     

       57
       57
        
             remotes = ["https://rubygems.org"];

     

       58
       58
       -
             sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";

     

       58
       58
       +
             sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v";

     

       59
       59
        
             type = "gem";

     

       60
       60
        
           };

     

       61
       61
       -
           version = "4.2.8";

     

       61
       61
       +
           version = "4.2.10";

     

       62
       62
        
         };

     

       63
       63
        
         activerecord = {

     

       64
       64
        
           dependencies = ["activemodel" "activesupport" "arel"];

     

       65
       65
        
           source = {

     

       66
       66
        
             remotes = ["https://rubygems.org"];

     

       67
       67
       -
             sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";

     

       67
       67
       +
             sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s";

     

       68
       68
        
             type = "gem";

     

       69
       69
        
           };

     

       70
       70
       -
           version = "4.2.8";

     

       70
       70
       +
           version = "4.2.10";

     

       71
       71
        
         };

     

       72
       72
        
         activerecord-nulldb-adapter = {

     

       73
       73
        
           dependencies = ["activerecord"];

     
···

       91
       91
        
           dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];

     

       92
       92
        
           source = {

     

       93
       93
        
             remotes = ["https://rubygems.org"];

     

       94
       94
       -
             sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";

     

       94
       94
       +
             sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";

     

       95
       95
        
             type = "gem";

     

       96
       96
        
           };

     

       97
       97
       -
           version = "4.2.8";

     

       97
       97
       +
           version = "4.2.10";

     

       98
       98
        
         };

     

       99
       99
        
         acts-as-taggable-on = {

     

       100
       100
        
           dependencies = ["activerecord"];

     
···

       248
       248
        
           };

     

       249
       249
        
           version = "0.3.2";

     

       250
       250
        
         };

     

       251
       251
       +
         batch-loader = {

     

       252
       252
       +
           source = {

     

       253
       253
       +
             remotes = ["https://rubygems.org"];

     

       254
       254
       +
             sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv";

     

       255
       255
       +
             type = "gem";

     

       256
       256
       +
           };

     

       257
       257
       +
           version = "1.1.1";

     

       258
       258
       +
         };

     

       251
       259
        
         bcrypt = {

     

       252
       260
        
           source = {

     

       253
       261
        
             remotes = ["https://rubygems.org"];

     
···

       298
       306
        
           };

     

       299
       307
        
           version = "0.7.2";

     

       300
       308
        
         };

     

       309
       309
       +
         blankslate = {

     

       310
       310
       +
           source = {

     

       311
       311
       +
             remotes = ["https://rubygems.org"];

     

       312
       312
       +
             sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";

     

       313
       313
       +
             type = "gem";

     

       314
       314
       +
           };

     

       315
       315
       +
           version = "2.1.2.4";

     

       316
       316
       +
         };

     

       301
       317
        
         bootstrap-sass = {

     

       302
       318
        
           dependencies = ["autoprefixer-rails" "sass"];

     

       303
       319
        
           source = {

     
···

       387
       403
        
           dependencies = ["activemodel" "activesupport" "mime-types"];

     

       388
       404
        
           source = {

     

       389
       405
        
             remotes = ["https://rubygems.org"];

     

       390
       390
       -
             sha256 = "0nms4w6vkm7djghdxwi9qzykhc2ynjwblgqwk87w61fhispqlq2c";

     

       406
       406
       +
             sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii";

     

       391
       407
        
             type = "gem";

     

       392
       408
        
           };

     

       393
       393
       -
           version = "1.1.0";

     

       409
       409
       +
           version = "1.2.1";

     

       394
       410
        
         };

     

       395
       411
        
         cause = {

     

       396
       412
        
           source = {

     
···

       407
       423
        
             type = "gem";

     

       408
       424
        
           };

     

       409
       425
        
           version = "0.7.5";

     

       426
       426
       +
         };

     

       427
       427
       +
         childprocess = {

     

       428
       428
       +
           dependencies = ["ffi"];

     

       429
       429
       +
           source = {

     

       430
       430
       +
             remotes = ["https://rubygems.org"];

     

       431
       431
       +
             sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd";

     

       432
       432
       +
             type = "gem";

     

       433
       433
       +
           };

     

       434
       434
       +
           version = "0.7.0";

     

       410
       435
        
         };

     

       411
       436
        
         chronic = {

     

       412
       437
        
           source = {

     
···

       441
       466
        
           };

     

       442
       467
        
           version = "3.0.2";

     

       443
       468
        
         };

     

       444
       444
       -
         cliver = {

     

       445
       445
       -
           source = {

     

       446
       446
       -
             remotes = ["https://rubygems.org"];

     

       447
       447
       -
             sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";

     

       448
       448
       -
             type = "gem";

     

       449
       449
       -
           };

     

       450
       450
       -
           version = "0.3.2";

     

       451
       451
       -
         };

     

       452
       469
        
         coderay = {

     

       453
       470
        
           source = {

     

       454
       471
        
             remotes = ["https://rubygems.org"];

     
···

       894
       911
        
           dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];

     

       895
       912
        
           source = {

     

       896
       913
        
             remotes = ["https://rubygems.org"];

     

       897
       897
       -
             sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";

     

       914
       914
       +
             sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";

     

       898
       915
        
             type = "gem";

     

       899
       916
        
           };

     

       900
       900
       -
           version = "0.1.0";

     

       917
       917
       +
           version = "0.2.0";

     

       901
       918
        
         };

     

       902
       919
        
         fog-aws = {

     

       903
       920
        
           dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];

     
···

       1071
       1088
        
           dependencies = ["google-protobuf" "grpc"];

     

       1072
       1089
        
           source = {

     

       1073
       1090
        
             remotes = ["https://rubygems.org"];

     

       1074
       1074
       -
             sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";

     

       1091
       1091
       +
             sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";

     

       1075
       1092
        
             type = "gem";

     

       1076
       1093
        
           };

     

       1077
       1077
       -
           version = "0.39.0";

     

       1094
       1094
       +
           version = "0.59.0";

     

       1078
       1095
        
         };

     

       1079
       1096
        
         github-linguist = {

     

       1080
       1097
        
           dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];

     
···

       1114
       1131
        
         gitlab-markup = {

     

       1115
       1132
        
           source = {

     

       1116
       1133
        
             remotes = ["https://rubygems.org"];

     

       1117
       1117
       -
             sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";

     

       1134
       1134
       +
             sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";

     

       1118
       1135
        
             type = "gem";

     

       1119
       1136
        
           };

     

       1120
       1120
       -
           version = "1.6.2";

     

       1137
       1137
       +
           version = "1.6.3";

     

       1121
       1138
        
         };

     

       1122
       1139
        
         gitlab_omniauth-ldap = {

     

       1123
       1140
        
           dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];

     
···

       1132
       1149
        
           dependencies = ["activesupport"];

     

       1133
       1150
        
           source = {

     

       1134
       1151
        
             remotes = ["https://rubygems.org"];

     

       1135
       1135
       -
             sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak";

     

       1152
       1152
       +
             sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";

     

       1136
       1153
        
             type = "gem";

     

       1137
       1154
        
           };

     

       1138
       1138
       -
           version = "0.3.7";

     

       1155
       1155
       +
           version = "0.4.1";

     

       1139
       1156
        
         };

     

       1140
       1157
        
         gollum-grit_adapter = {

     

       1141
       1158
        
           dependencies = ["gitlab-grit"];

     
···

       1185
       1202
        
         google-protobuf = {

     

       1186
       1203
        
           source = {

     

       1187
       1204
        
             remotes = ["https://rubygems.org"];

     

       1188
       1188
       -
             sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";

     

       1205
       1205
       +
             sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6";

     

       1189
       1206
        
             type = "gem";

     

       1190
       1207
        
           };

     

       1191
       1191
       -
           version = "3.4.0.2";

     

       1208
       1208
       +
           version = "3.4.1.1";

     

       1192
       1209
        
         };

     

       1193
       1210
        
         googleauth = {

     

       1194
       1211
        
           dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];

     
···

       1248
       1265
        
           dependencies = ["google-protobuf" "googleauth"];

     

       1249
       1266
        
           source = {

     

       1250
       1267
        
             remotes = ["https://rubygems.org"];

     

       1251
       1251
       -
             sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";

     

       1268
       1268
       +
             sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";

     

       1252
       1269
        
             type = "gem";

     

       1253
       1270
        
           };

     

       1254
       1254
       -
           version = "1.6.0";

     

       1271
       1271
       +
           version = "1.4.5";

     

       1255
       1272
        
         };

     

       1256
       1273
        
         haml = {

     

       1257
       1274
        
           dependencies = ["tilt"];

     
···

       1401
       1418
        
           version = "2.8.2";

     

       1402
       1419
        
         };

     

       1403
       1420
        
         i18n = {

     

       1421
       1421
       +
           dependencies = ["concurrent-ruby"];

     

       1404
       1422
        
           source = {

     

       1405
       1423
        
             remotes = ["https://rubygems.org"];

     

       1406
       1406
       -
             sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw";

     

       1424
       1424
       +
             sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";

     

       1407
       1425
        
             type = "gem";

     

       1408
       1426
        
           };

     

       1409
       1409
       -
           version = "0.8.6";

     

       1427
       1427
       +
           version = "0.9.1";

     

       1410
       1428
        
         };

     

       1411
       1429
        
         ice_nine = {

     

       1412
       1430
        
           source = {

     
···

       1454
       1472
        
           dependencies = ["rails-dom-testing" "railties" "thor"];

     

       1455
       1473
        
           source = {

     

       1456
       1474
        
             remotes = ["https://rubygems.org"];

     

       1457
       1457
       -
             sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1";

     

       1475
       1475
       +
             sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki";

     

       1458
       1476
        
             type = "gem";

     

       1459
       1477
        
           };

     

       1460
       1460
       -
           version = "4.1.1";

     

       1478
       1478
       +
           version = "4.3.1";

     

       1461
       1479
        
         };

     

       1462
       1480
        
         json = {

     

       1463
       1481
        
           source = {

     
···

       1582
       1600
        
           version = "1.3.0";

     

       1583
       1601
        
         };

     

       1584
       1602
        
         license_finder = {

     

       1585
       1585
       -
           dependencies = ["httparty" "rubyzip" "thor" "xml-simple"];

     

       1603
       1603
       +
           dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"];

     

       1586
       1604
        
           source = {

     

       1587
       1605
        
             remotes = ["https://rubygems.org"];

     

       1588
       1588
       -
             sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80";

     

       1606
       1606
       +
             sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag";

     

       1589
       1607
        
             type = "gem";

     

       1590
       1608
        
           };

     

       1591
       1591
       -
           version = "2.1.0";

     

       1609
       1609
       +
           version = "3.1.1";

     

       1592
       1610
        
         };

     

       1593
       1611
        
         licensee = {

     

       1594
       1612
        
           dependencies = ["rugged"];

     
···

       1643
       1661
        
           version = "2.0.3";

     

       1644
       1662
        
         };

     

       1645
       1663
        
         mail = {

     

       1646
       1646
       -
           dependencies = ["mime-types"];

     

       1664
       1664
       +
           dependencies = ["mini_mime"];

     

       1647
       1665
        
           source = {

     

       1648
       1666
        
             remotes = ["https://rubygems.org"];

     

       1649
       1649
       -
             sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";

     

       1667
       1667
       +
             sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";

     

       1650
       1668
        
             type = "gem";

     

       1651
       1669
        
           };

     

       1652
       1652
       -
           version = "2.6.6";

     

       1670
       1670
       +
           version = "2.7.0";

     

       1653
       1671
        
         };

     

       1654
       1672
        
         mail_room = {

     

       1655
       1673
        
           source = {

     
···

       1733
       1751
        
           };

     

       1734
       1752
        
           version = "5.7.0";

     

       1735
       1753
        
         };

     

       1736
       1736
       -
         mmap2 = {

     

       1737
       1737
       -
           source = {

     

       1738
       1738
       -
             remotes = ["https://rubygems.org"];

     

       1739
       1739
       -
             sha256 = "1rgf4zhqa6632nbqj585hc0x69iz21s5c91mpijcr9i5wpj9p1s6";

     

       1740
       1740
       -
             type = "gem";

     

       1741
       1741
       -
           };

     

       1742
       1742
       -
           version = "2.2.7";

     

       1743
       1743
       -
         };

     

       1744
       1754
        
         mousetrap-rails = {

     

       1745
       1755
        
           source = {

     

       1746
       1756
        
             remotes = ["https://rubygems.org"];

     
···

       2081
       2091
        
           dependencies = ["ast"];

     

       2082
       2092
        
           source = {

     

       2083
       2093
        
             remotes = ["https://rubygems.org"];

     

       2084
       2084
       -
             sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";

     

       2094
       2094
       +
             sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3";

     

       2095
       2095
       +
             type = "gem";

     

       2096
       2096
       +
           };

     

       2097
       2097
       +
           version = "2.4.0.2";

     

       2098
       2098
       +
         };

     

       2099
       2099
       +
         parslet = {

     

       2100
       2100
       +
           dependencies = ["blankslate"];

     

       2101
       2101
       +
           source = {

     

       2102
       2102
       +
             remotes = ["https://rubygems.org"];

     

       2103
       2103
       +
             sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";

     

       2085
       2104
        
             type = "gem";

     

       2086
       2105
        
           };

     

       2087
       2087
       -
           version = "2.4.0.0";

     

       2106
       2106
       +
           version = "1.5.0";

     

       2088
       2107
        
         };

     

       2089
       2108
        
         path_expander = {

     

       2090
       2109
        
           source = {

     
···

       2192
       2211
        
           };

     

       2193
       2212
        
           version = "1.0.1";

     

       2194
       2213
        
         };

     

       2195
       2195
       -
         poltergeist = {

     

       2196
       2196
       -
           dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];

     

       2197
       2197
       -
           source = {

     

       2198
       2198
       -
             remotes = ["https://rubygems.org"];

     

       2199
       2199
       -
             sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0";

     

       2200
       2200
       -
             type = "gem";

     

       2201
       2201
       -
           };

     

       2202
       2202
       -
           version = "1.9.0";

     

       2203
       2203
       -
         };

     

       2204
       2214
        
         posix-spawn = {

     

       2205
       2215
        
           source = {

     

       2206
       2216
        
             remotes = ["https://rubygems.org"];

     
···

       2253
       2263
        
           version = "0.0.3";

     

       2254
       2264
        
         };

     

       2255
       2265
        
         prometheus-client-mmap = {

     

       2256
       2256
       -
           dependencies = ["mmap2"];

     

       2257
       2266
        
           source = {

     

       2258
       2267
        
             remotes = ["https://rubygems.org"];

     

       2259
       2259
       -
             sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";

     

       2268
       2268
       +
             sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij";

     

       2260
       2269
        
             type = "gem";

     

       2261
       2270
        
           };

     

       2262
       2262
       -
           version = "0.7.0.beta18";

     

       2271
       2271
       +
           version = "0.7.0.beta43";

     

       2263
       2272
        
         };

     

       2264
       2273
        
         pry = {

     

       2265
       2274
        
           dependencies = ["coderay" "method_source" "slop"];

     
···

       2378
       2387
        
           dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];

     

       2379
       2388
        
           source = {

     

       2380
       2389
        
             remotes = ["https://rubygems.org"];

     

       2381
       2381
       -
             sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch";

     

       2390
       2390
       +
             sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l";

     

       2382
       2391
        
             type = "gem";

     

       2383
       2392
        
           };

     

       2384
       2384
       -
           version = "4.2.8";

     

       2393
       2393
       +
           version = "4.2.10";

     

       2385
       2394
        
         };

     

       2386
       2395
        
         rails-deprecated_sanitizer = {

     

       2387
       2396
        
           dependencies = ["activesupport"];

     
···

       2423
       2432
        
           dependencies = ["actionpack" "activesupport" "rake" "thor"];

     

       2424
       2433
        
           source = {

     

       2425
       2434
        
             remotes = ["https://rubygems.org"];

     

       2426
       2426
       -
             sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";

     

       2435
       2435
       +
             sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p";

     

       2427
       2436
        
             type = "gem";

     

       2428
       2437
        
           };

     

       2429
       2429
       -
           version = "4.2.8";

     

       2438
       2438
       +
           version = "4.2.10";

     

       2430
       2439
        
         };

     

       2431
       2440
        
         rainbow = {

     

       2432
       2441
        
           dependencies = ["rake"];

     
···

       2448
       2457
        
         rake = {

     

       2449
       2458
        
           source = {

     

       2450
       2459
        
             remotes = ["https://rubygems.org"];

     

       2451
       2451
       -
             sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";

     

       2460
       2460
       +
             sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf";

     

       2452
       2461
        
             type = "gem";

     

       2453
       2462
        
           };

     

       2454
       2454
       -
           version = "12.1.0";

     

       2463
       2463
       +
           version = "12.3.0";

     

       2455
       2464
        
         };

     

       2456
       2465
        
         rblineprof = {

     

       2457
       2466
        
           dependencies = ["debugger-ruby_core_source"];

     
···

       2542
       2551
        
           dependencies = ["actionpack" "redis-rack" "redis-store"];

     

       2543
       2552
        
           source = {

     

       2544
       2553
        
             remotes = ["https://rubygems.org"];

     

       2545
       2545
       -
             sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr";

     

       2554
       2554
       +
             sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";

     

       2546
       2555
        
             type = "gem";

     

       2547
       2556
        
           };

     

       2548
       2548
       -
           version = "5.0.1";

     

       2557
       2557
       +
           version = "5.0.2";

     

       2549
       2558
        
         };

     

       2550
       2559
        
         redis-activesupport = {

     

       2551
       2560
        
           dependencies = ["activesupport" "redis-store"];

     

       2552
       2561
        
           source = {

     

       2553
       2562
        
             remotes = ["https://rubygems.org"];

     

       2554
       2554
       -
             sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd";

     

       2563
       2563
       +
             sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";

     

       2555
       2564
        
             type = "gem";

     

       2556
       2565
        
           };

     

       2557
       2557
       -
           version = "5.0.1";

     

       2566
       2566
       +
           version = "5.0.4";

     

       2558
       2567
        
         };

     

       2559
       2568
        
         redis-namespace = {

     

       2560
       2569
        
           dependencies = ["redis"];

     
···

       2569
       2578
        
           dependencies = ["rack" "redis-store"];

     

       2570
       2579
        
           source = {

     

       2571
       2580
        
             remotes = ["https://rubygems.org"];

     

       2572
       2572
       -
             sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3";

     

       2581
       2581
       +
             sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";

     

       2573
       2582
        
             type = "gem";

     

       2574
       2583
        
           };

     

       2575
       2575
       -
           version = "1.6.0";

     

       2584
       2584
       +
           version = "2.0.4";

     

       2576
       2585
        
         };

     

       2577
       2586
        
         redis-rails = {

     

       2578
       2587
        
           dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];

     

       2579
       2588
        
           source = {

     

       2580
       2589
        
             remotes = ["https://rubygems.org"];

     

       2581
       2581
       -
             sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm";

     

       2590
       2590
       +
             sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";

     

       2582
       2591
        
             type = "gem";

     

       2583
       2592
        
           };

     

       2584
       2584
       -
           version = "5.0.1";

     

       2593
       2593
       +
           version = "5.0.2";

     

       2585
       2594
        
         };

     

       2586
       2595
        
         redis-store = {

     

       2587
       2596
        
           dependencies = ["redis"];

     

       2588
       2597
        
           source = {

     

       2589
       2598
        
             remotes = ["https://rubygems.org"];

     

       2590
       2590
       -
             sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq";

     

       2599
       2599
       +
             sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq";

     

       2591
       2600
        
             type = "gem";

     

       2592
       2601
        
           };

     

       2593
       2593
       -
           version = "1.2.0";

     

       2602
       2602
       +
           version = "1.4.1";

     

       2594
       2603
        
         };

     

       2595
       2604
        
         representable = {

     

       2596
       2605
        
           dependencies = ["declarative" "declarative-option" "uber"];

     
···

       2953
       2962
        
             type = "gem";

     

       2954
       2963
        
           };

     

       2955
       2964
        
           version = "3.5.9.3";

     

       2965
       2965
       +
         };

     

       2966
       2966
       +
         selenium-webdriver = {

     

       2967
       2967
       +
           dependencies = ["childprocess" "rubyzip"];

     

       2968
       2968
       +
           source = {

     

       2969
       2969
       +
             remotes = ["https://rubygems.org"];

     

       2970
       2970
       +
             sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30";

     

       2971
       2971
       +
             type = "gem";

     

       2972
       2972
       +
           };

     

       2973
       2973
       +
           version = "3.5.0";

     

       2956
       2974
        
         };

     

       2957
       2975
        
         sentry-raven = {

     

       2958
       2976
        
           dependencies = ["faraday"];

     
···

       3141
       3159
        
           dependencies = ["actionpack" "activesupport" "sprockets"];

     

       3142
       3160
        
           source = {

     

       3143
       3161
        
             remotes = ["https://rubygems.org"];

     

       3144
       3144
       -
             sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44";

     

       3162
       3162
       +
             sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";

     

       3145
       3163
        
             type = "gem";

     

       3146
       3164
        
           };

     

       3147
       3147
       -
           version = "3.2.0";

     

       3165
       3165
       +
           version = "3.2.1";

     

       3148
       3166
        
         };

     

       3149
       3167
        
         sqlite3 = {

     

       3150
       3168
        
           source = {

     
···

       3295
       3313
        
           };

     

       3296
       3314
        
           version = "0.8.3";

     

       3297
       3315
        
         };

     

       3316
       3316
       +
         toml = {

     

       3317
       3317
       +
           dependencies = ["parslet"];

     

       3318
       3318
       +
           source = {

     

       3319
       3319
       +
             remotes = ["https://rubygems.org"];

     

       3320
       3320
       +
             sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";

     

       3321
       3321
       +
             type = "gem";

     

       3322
       3322
       +
           };

     

       3323
       3323
       +
           version = "0.1.2";

     

       3324
       3324
       +
         };

     

       3298
       3325
        
         toml-rb = {

     

       3299
       3326
        
           dependencies = ["citrus"];

     

       3300
       3327
        
           source = {

     
···

       3317
       3344
        
           dependencies = ["thread_safe"];

     

       3318
       3345
        
           source = {

     

       3319
       3346
        
             remotes = ["https://rubygems.org"];

     

       3320
       3320
       -
             sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl";

     

       3347
       3347
       +
             sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";

     

       3321
       3348
        
             type = "gem";

     

       3322
       3349
        
           };

     

       3323
       3323
       -
           version = "1.2.3";

     

       3350
       3350
       +
           version = "1.2.4";

     

       3324
       3351
        
         };

     

       3325
       3352
        
         u2f = {

     

       3326
       3353
        
           source = {

     
···

       3476
       3503
        
           };

     

       3477
       3504
        
           version = "0.9.10";

     

       3478
       3505
        
         };

     

       3479
       3479
       -
         websocket-driver = {

     

       3480
       3480
       -
           dependencies = ["websocket-extensions"];

     

       3506
       3506
       +
         wikicloth = {

     

       3507
       3507
       +
           dependencies = ["builder" "expression_parser" "rinku"];

     

       3481
       3508
        
           source = {

     

       3482
       3509
        
             remotes = ["https://rubygems.org"];

     

       3483
       3483
       -
             sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";

     

       3510
       3510
       +
             sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";

     

       3484
       3511
        
             type = "gem";

     

       3485
       3512
        
           };

     

       3486
       3486
       -
           version = "0.6.3";

     

       3513
       3513
       +
           version = "0.8.1";

     

       3487
       3514
        
         };

     

       3488
       3488
       -
         websocket-extensions = {

     

       3515
       3515
       +
         with_env = {

     

       3489
       3516
        
           source = {

     

       3490
       3517
        
             remotes = ["https://rubygems.org"];

     

       3491
       3491
       -
             sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";

     

       3518
       3518
       +
             sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";

     

       3492
       3519
        
             type = "gem";

     

       3493
       3520
        
           };

     

       3494
       3494
       -
           version = "0.1.2";

     

       3495
       3495
       -
         };

     

       3496
       3496
       -
         wikicloth = {

     

       3497
       3497
       -
           dependencies = ["builder" "expression_parser" "rinku"];

     

       3498
       3498
       -
           source = {

     

       3499
       3499
       -
             remotes = ["https://rubygems.org"];

     

       3500
       3500
       -
             sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";

     

       3501
       3501
       -
             type = "gem";

     

       3502
       3502
       -
           };

     

       3503
       3503
       -
           version = "0.8.1";

     

       3521
       3521
       +
           version = "1.1.0";

     

       3504
       3522
        
         };

     

       3505
       3523
        
         xml-simple = {

     

       3506
       3524
        
           source = {

     
···

       3519
       3537
        
           };

     

       3520
       3538
        
           version = "2.1.0";

     

       3521
       3539
        
         };

     

       3522
       3522
       -
       }
     

       3540
       3540
       +
       }

+1 -1

pkgs/applications/version-management/gitlab/nulladapter.patch

···

       7
       7
        
        

     

       8
       8
        
       +gem 'activerecord-nulldb-adapter'

     

       9
       9
        
       +

     

       10
       10
       -
        gem 'rails', '4.2.8'

     

       10
       10
       +
        gem 'rails', '4.2.10'

     

       11
       11
        
        gem 'rails-deprecated_sanitizer', '~> 1.0.3'

     

       12
       12
        
        

     

       13
       13
        
       diff --git a/Gemfile.lock b/Gemfile.lock

+5 -14

pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch

···

       62
       62
        
       index 59b21149a9..4f4a39a06c 100644

     

       63
       63
        
       --- a/lib/gitlab/logger.rb

     

       64
       64
        
       +++ b/lib/gitlab/logger.rb

     

       65
       65
       -
       @@ -13,7 +13,7 @@

     

       65
       65
       +
       @@ -26,7 +26,7 @@

     

       66
       66
        
            end

     

       67
       67
        
        

     

       68
       68
       -
            def self.read_latest

     

       69
       69
       -
       -      path = Rails.root.join("log", file_name)

     

       70
       70
       -
       +      path = File.join(ENV["GITLAB_LOG_PATH"], file_name)

     

       71
       71
       -
        

     

       72
       72
       -
              return [] unless File.readable?(path)

     

       73
       73
       -
        

     

       74
       74
       -
       @@ -22,7 +22,7 @@

     

       68
       68
       +
            def self.full_log_path

     

       69
       69
       +
       -      Rails.root.join("log", file_name)

     

       70
       70
       +
       +      File.join(ENV["GITLAB_LOG_PATH"], file_name)

     

       75
       71
        
            end

     

       76
       72
        
        

     

       77
       77
       -
            def self.build

     

       78
       78
       -
       -      new(Rails.root.join("log", file_name))

     

       79
       79
       -
       +      new(File.join(ENV["GITLAB_LOG_PATH"], file_name))

     

       80
       80
       -
            end

     

       81
       81
       -
          end

     

       82
       82
       -
        end

     

       73
       73
       +
            def self.cache_key

     

       83
       74
        
       diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb

     

       84
       75
        
       index b5f4124052..f72c556983 100644

     

       85
       76
        
       --- a/lib/gitlab/uploads_transfer.rb