commit d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937 · pyrox.dev/nixpkgs

+31 -7

nixos/modules/services/misc/gitlab.nix

···

       43
       43
        
       

     

       44
       44
        
         secretsYml = ''

     

       45
       45
        
           production:

     

       46
       46
       -
             db_key_base: ${cfg.secrets.db_key_base}

     

       46
       46
       +
             secret_key_base: ${cfg.secrets.secret}

     

       47
       47
       +
             otp_key_base: ${cfg.secrets.otp}

     

       48
       48
       +
             db_key_base: ${cfg.secrets.db}

     

       47
       49
        
         '';

     

       48
       50
        
       

     

       49
       51
        
         gitlabConfig = {

     
···

       121
       123
        
             makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \

     

       122
       124
        
                 ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \

     

       123
       125
        
                 --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \

     

       124
       124
       -
                 --set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \

     

       126
       126
       +
                 --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \

     

       125
       127
        
                 --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \

     

       126
       128
        
                 --run 'cd ${cfg.packages.gitlab}/share/gitlab'

     

       127
       129
        
             makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \

     
···

       318
       320
        
               };

     

       319
       321
        
             };

     

       320
       322
        
       

     

       321
       321
       -
             secrets.db_key_base = mkOption {

     

       323
       323
       +
             secrets.secret = mkOption {

     

       322
       324
        
               type = types.str;

     

       323
       323
       -
               example = "";

     

       324
       325
        
               description = ''

     

       325
       325
       -
                 The db_key_base secrets is used to encrypt variables in the DB. If

     

       326
       326
       +
                 The secret is used to encrypt variables in the DB. If

     

       326
       327
        
                 you change or lose this key you will be unable to access variables

     

       327
       328
        
                 stored in database.

     

       328
       329
        
       

     
···

       331
       332
        
               '';

     

       332
       333
        
             };

     

       333
       334
        
       

     

       335
       335
       +
             secrets.db = mkOption {

     

       336
       336
       +
               type = types.str;

     

       337
       337
       +
               description = ''

     

       338
       338
       +
                 The secret is used to encrypt variables in the DB. If

     

       339
       339
       +
                 you change or lose this key you will be unable to access variables

     

       340
       340
       +
                 stored in database.

     

       341
       341
       +
       

     

       342
       342
       +
                 Make sure the secret is at least 30 characters and all random,

     

       343
       343
       +
                 no regular words or you'll be exposed to dictionary attacks.

     

       344
       344
       +
               '';

     

       345
       345
       +
             };

     

       346
       346
       +
       

     

       347
       347
       +
             secrets.otp = mkOption {

     

       348
       348
       +
               type = types.str;

     

       349
       349
       +
               description = ''

     

       350
       350
       +
                 The secret is used to encrypt secrets for OTP tokens. If

     

       351
       351
       +
                 you change or lose this key, users which have 2FA enabled for login

     

       352
       352
       +
                 won't be able to login anymore.

     

       353
       353
       +
       

     

       354
       354
       +
                 Make sure the secret is at least 30 characters and all random,

     

       355
       355
       +
                 no regular words or you'll be exposed to dictionary attacks.

     

       356
       356
       +
               '';

     

       357
       357
       +
             };

     

       358
       358
       +
       

     

       334
       359
        
             extraConfig = mkOption {

     

       335
       360
        
               type = types.attrs;

     

       336
       361
        
               default = {};

     
···

       458
       483
        
               rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks

     

       459
       484
        
               mkdir -p ${cfg.statePath}/config ${cfg.statePath}/shell

     

       460
       485
        
       

     

       461
       461
       -
               # TODO: What exactly is gitlab-shell doing with the secret?

     

       462
       462
       -
               tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.statePath}/config/gitlab_shell_secret

     

       486
       486
       +
               tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret

     

       463
       487
        
       

     

       464
       488
        
               # The uploads directory is hardcoded somewhere deep in rails. It is

     

       465
       489
        
               # symlinked in the gitlab package to /run/gitlab/uploads to make it

+11 -6

nixos/modules/services/misc/gitlab.xml

···

       62
       62
        
           address = "localhost";

     

       63
       63
        
           port = 25;

     

       64
       64
        
         };

     

       65
       65
       -
         secrets.db_key_base = "ei3eeP1ohsh0uu3ad4YeeMeeheengah3AiZee2ohl4Ooj5mie4Ohl0vishoghaes";

     

       65
       65
       +
         secrets = {

     

       66
       66
       +
           db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";

     

       67
       67
       +
           secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";

     

       68
       68
       +
           otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";

     

       69
       69
       +
         };

     

       66
       70
        
         extraConfig = {

     

       67
       71
        
           gitlab = {

     

       68
       72
        
             email_from = "gitlab-no-reply@example.com";

     
···

       75
       79
        
       </programlisting>

     

       76
       80
        
       </para>

     

       77
       81
        
       

     

       78
       78
       -
       <para>If you're setting up a new Gitlab instance, generate a new

     

       79
       79
       -
       <literal>db_key_base</literal> secret to encrypt sensible data in the

     

       80
       80
       -
       database. If you're restoring an existing Gitlab instance, you must

     

       81
       81
       -
       specify the <literal>db_key_base</literal> secret from

     

       82
       82
       -
       <literal>config/secrets.yml</literal> in your Gitlab state folder.</para>

     

       82
       82
       +
       <para>If you're setting up a new Gitlab instance, generate new secrets. You

     

       83
       83
       +
       for instance use <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c 128</literal>

     

       84
       84
       +
       to generate a new secret. Gitlab encrypts sensitive data stored in the database.

     

       85
       85
       +
       If you're restoring an existing Gitlab instance, you must specify the secrets

     

       86
       86
       +
       secret from <literal>config/secrets.yml</literal> located in your Gitlab state

     

       87
       87
       +
       folder.</para>

     

       83
       88
        
       

     

       84
       89
        
       <para>Refer to <xref linkend="ch-options" /> for all available configuration

     

       85
       90
        
       options for the <literal>services.gitlab</literal> module.</para>

+2 -2

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

···

       1
       1
        
       { stdenv, ruby, bundler, fetchFromGitLab }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "3.2.1";

     

       4
       4
       +
         version = "3.4.0";

     

       5
       5
        
         name = "gitlab-shell-${version}";

     

       6
       6
        
       

     

       7
       7
        
         srcs = fetchFromGitLab {

     

       8
       8
        
           owner = "gitlab-org";

     

       9
       9
        
           repo = "gitlab-shell";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "099w4s606k2mk9xc42jwqym1ycr20824w6nkf3zpiv17slwakw90";

     

       11
       11
       +
           sha256 = "1vhwsiz6n96i6cbcqbf4pa93nzx4xkaph2lmzh0nm4mi5ydl49is";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [

+2 -2

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

···

       1
       1
        
       { stdenv, fetchFromGitLab, git, go }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "0.7.8";

     

       4
       4
       +
         version = "0.7.11";

     

       5
       5
        
         name = "gitlab-workhorse-${version}";

     

       6
       6
        
       

     

       7
       7
        
         srcs = fetchFromGitLab {

     

       8
       8
        
           owner = "gitlab-org";

     

       9
       9
        
           repo = "gitlab-workhorse";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "03lhgmd8w2ainvgf2q3pgafz2jl5g4x32qyybyijlyxfl07vkg4g";

     

       11
       11
       +
           sha256 = "1z32nf9qbw050wzl1dsydrs68c9fp5kkvdn58z2g88bbyk6gyivm";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ git go ];

+17 -15

pkgs/applications/version-management/gitlab/Gemfile

···

       9
       9
        
       # Specify a sprockets version due to increased performance

     

       10
       10
        
       # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069

     

       11
       11
        
       gem 'sprockets', '~> 3.6.0'

     

       12
       12
       +
       gem 'sprockets-es6'

     

       12
       13
        
       

     

       13
       14
        
       # Default values for AR models

     

       14
       15
        
       gem 'default_value_for', '~> 3.0.0'

     
···

       19
       20
        
       

     

       20
       21
        
       # Authentication libraries

     

       21
       22
        
       gem 'devise',                 '~> 4.0'

     

       22
       22
       -
       gem 'doorkeeper',             '~> 4.0'

     

       23
       23
       +
       gem 'doorkeeper',             '~> 4.2.0'

     

       23
       24
        
       gem 'omniauth',               '~> 1.3.1'

     

       24
       25
        
       gem 'omniauth-auth0',         '~> 1.4.1'

     

       25
       26
        
       gem 'omniauth-azure-oauth2',  '~> 0.0.6'

     
···

       52
       53
        
       

     

       53
       54
        
       # Extracting information from a git repository

     

       54
       55
        
       # Provide access to Gitlab::Git library

     

       55
       55
       -
       gem 'gitlab_git', '~> 10.3.2'

     

       56
       56
       +
       gem 'gitlab_git', '~> 10.4.7'

     

       56
       57
        
       

     

       57
       58
        
       # LDAP Auth

     

       58
       59
        
       # GitLab fork with several improvements to original library. For full list of changes

     
···

       68
       69
        
       gem 'github-linguist', '~> 4.7.0', require: 'linguist'

     

       69
       70
        
       

     

       70
       71
        
       # API

     

       71
       71
       -
       gem 'grape',        '~> 0.13.0'

     

       72
       72
       +
       gem 'grape',        '~> 0.15.0'

     

       72
       73
        
       gem 'grape-entity', '~> 0.4.2'

     

       73
       74
        
       gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'

     

       74
       75
        
       

     
···

       76
       77
        
       gem 'kaminari', '~> 0.17.0'

     

       77
       78
        
       

     

       78
       79
        
       # HAML

     

       79
       79
       -
       gem 'hamlit', '~> 2.5'

     

       80
       80
       +
       gem 'hamlit', '~> 2.6.1'

     

       80
       81
        
       

     

       81
       82
        
       # Files attachments

     

       82
       83
        
       gem 'carrierwave', '~> 0.10.0'

     
···

       153
       154
        
       

     

       154
       155
        
       # Misc

     

       155
       156
        
       

     

       156
       156
       -
       gem 'version_sorter', '~> 2.0.0'

     

       157
       157
       +
       gem 'version_sorter', '~> 2.1.0'

     

       157
       158
        
       

     

       158
       159
        
       # Cache

     

       159
       160
        
       gem 'redis-rails', '~> 4.0.0'

     
···

       161
       162
        
       # Redis

     

       162
       163
        
       gem 'redis', '~> 3.2'

     

       163
       164
        
       gem 'connection_pool', '~> 2.0'

     

       164
       164
       -
       

     

       165
       165
       -
       # Campfire integration

     

       166
       166
       -
       gem 'tinder', '~> 1.10.0'

     

       167
       165
        
       

     

       168
       166
        
       # HipChat integration

     

       169
       167
        
       gem 'hipchat', '~> 1.5.0'

     
···

       203
       201
        
       gem 'rack-attack', '~> 4.3.1'

     

       204
       202
        
       

     

       205
       203
        
       # Ace editor

     

       206
       206
       -
       gem 'ace-rails-ap', '~> 4.0.2'

     

       204
       204
       +
       gem 'ace-rails-ap', '~> 4.1.0'

     

       207
       205
        
       

     

       208
       206
        
       # Keyboard shortcuts

     

       209
       207
        
       gem 'mousetrap-rails', '~> 1.4.6'

     
···

       211
       209
        
       # Detect and convert string character encoding

     

       212
       210
        
       gem 'charlock_holmes', '~> 0.7.3'

     

       213
       211
        
       

     

       214
       214
       -
       # Parse duration

     

       212
       212
       +
       # Parse time & duration

     

       213
       213
       +
       gem 'chronic', '~> 0.10.2'

     

       215
       214
        
       gem 'chronic_duration', '~> 0.10.6'

     

       216
       215
        
       

     

       217
       216
        
       gem 'sass-rails', '~> 5.0.0'

     
···

       224
       223
        
       gem 'bootstrap-sass',     '~> 3.3.0'

     

       225
       224
        
       gem 'font-awesome-rails', '~> 4.6.1'

     

       226
       225
        
       gem 'gemojione',          '~> 3.0'

     

       227
       227
       -
       gem 'gon',                '~> 6.0.1'

     

       226
       226
       +
       gem 'gon',                '~> 6.1.0'

     

       228
       227
        
       gem 'jquery-atwho-rails', '~> 1.3.2'

     

       229
       228
        
       gem 'jquery-rails',       '~> 4.1.0'

     

       230
       229
        
       gem 'jquery-ui-rails',    '~> 5.0.0'

     
···

       252
       251
        
       

     

       253
       252
        
         gem 'letter_opener_web', '~> 1.3.0'

     

       254
       253
        
         gem 'rerun', '~> 0.11.0'

     

       255
       255
       -
         gem 'bullet', '~> 5.0.0', require: false

     

       254
       254
       +
         gem 'bullet', '~> 5.2.0', require: false

     

       256
       255
        
         gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

     

       257
       256
        
         gem 'web-console', '~> 2.0'

     

       258
       257
        
       

     
···

       274
       273
        
         gem 'awesome_print', '~> 1.2.0', require: false

     

       275
       274
        
         gem 'fuubar', '~> 2.0.0'

     

       276
       275
        
       

     

       277
       277
       -
         gem 'database_cleaner',   '~> 1.4.0'

     

       276
       276
       +
         gem 'database_cleaner',   '~> 1.5.0'

     

       278
       277
        
         gem 'factory_girl_rails', '~> 4.6.0'

     

       279
       278
        
         gem 'rspec-rails',        '~> 3.5.0'

     

       280
       279
        
         gem 'rspec-retry',        '~> 0.4.5'

     
···

       302
       301
        
         gem 'rubocop', '~> 0.41.2', require: false

     

       303
       302
        
         gem 'rubocop-rspec', '~> 1.5.0', require: false

     

       304
       303
        
         gem 'scss_lint', '~> 0.47.0', require: false

     

       305
       305
       -
         gem 'simplecov', '~> 0.11.0', require: false

     

       304
       304
       +
         gem 'simplecov', '0.12.0', require: false

     

       306
       305
        
         gem 'flog', '~> 4.3.2', require: false

     

       307
       306
        
         gem 'flay', '~> 2.6.1', require: false

     

       308
       307
        
         gem 'bundler-audit', '~> 0.5.0', require: false

     
···

       316
       315
        
       group :test do

     

       317
       316
        
         gem 'shoulda-matchers', '~> 2.8.0', require: false

     

       318
       317
        
         gem 'email_spec', '~> 1.6.0'

     

       318
       318
       +
         gem 'json-schema', '~> 2.6.2'

     

       319
       319
        
         gem 'webmock', '~> 1.21.0'

     

       320
       320
        
         gem 'test_after_commit', '~> 0.4.2'

     

       321
       321
        
         gem 'sham_rack', '~> 1.3.6'

     
···

       325
       325
        
         gem 'gitlab_meta', '7.0'

     

       326
       326
        
       end

     

       327
       327
        
       

     

       328
       328
       -
       gem 'newrelic_rpm', '~> 3.14'

     

       328
       328
       +
       gem 'newrelic_rpm', '~> 3.16'

     

       329
       329
        
       

     

       330
       330
        
       gem 'octokit', '~> 4.3.0'

     

       331
       331
        
       

     

       332
       332
        
       gem 'mail_room', '~> 0.8'

     

       333
       333
        
       

     

       334
       334
        
       gem 'email_reply_parser', '~> 0.5.8'

     

       335
       335
       +
       

     

       336
       336
       +
       gem 'ruby-prof', '~> 0.15.9'

     

       335
       337
        
       

     

       336
       338
        
       ## CI

     

       337
       339
        
       gem 'activerecord-session_store', '~> 1.0.0'

+49 -48

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

···

       2
       2
        
         remote: https://rubygems.org/

     

       3
       3
        
         specs:

     

       4
       4
        
           RedCloth (4.3.2)

     

       5
       5
       -
           ace-rails-ap (4.0.2)

     

       5
       5
       +
           ace-rails-ap (4.1.0)

     

       6
       6
        
           actionmailer (4.2.7.1)

     

       7
       7
        
             actionpack (= 4.2.7.1)

     

       8
       8
        
             actionview (= 4.2.7.1)

     
···

       61
       61
        
             oauth2 (~> 1.0)

     

       62
       62
        
           asciidoctor (1.5.3)

     

       63
       63
        
           ast (2.3.0)

     

       64
       64
       -
           attr_encrypted (3.0.1)

     

       64
       64
       +
           attr_encrypted (3.0.3)

     

       65
       65
        
             encryptor (~> 3.0.0)

     

       66
       66
        
           attr_required (1.0.0)

     

       67
       67
        
           autoprefixer-rails (6.2.3)

     
···

       87
       87
        
             faraday (~> 0.9)

     

       88
       88
        
             faraday_middleware (~> 0.10)

     

       89
       89
        
             nokogiri (~> 1.6)

     

       90
       90
       +
           babel-source (5.8.35)

     

       91
       91
       +
           babel-transpiler (0.7.0)

     

       92
       92
       +
             babel-source (>= 4.0, < 6)

     

       93
       93
       +
             execjs (~> 2.0)

     

       90
       94
        
           babosa (1.0.2)

     

       91
       95
        
           base32 (0.3.2)

     

       92
       96
        
           bcrypt (3.1.11)

     
···

       102
       106
        
           brakeman (3.3.2)

     

       103
       107
        
           browser (2.2.0)

     

       104
       108
        
           builder (3.2.2)

     

       105
       105
       -
           bullet (5.0.0)

     

       109
       109
       +
           bullet (5.2.0)

     

       106
       110
        
             activesupport (>= 3.0.0)

     

       107
       107
       -
             uniform_notifier (~> 1.9.0)

     

       111
       111
       +
             uniform_notifier (~> 1.10.0)

     

       108
       112
        
           bundler-audit (0.5.0)

     

       109
       113
        
             bundler (~> 1.2)

     

       110
       114
        
             thor (~> 0.18)

     
···

       126
       130
        
             mime-types (>= 1.16)

     

       127
       131
        
           cause (0.1)

     

       128
       132
        
           charlock_holmes (0.7.3)

     

       133
       133
       +
           chronic (0.10.2)

     

       129
       134
        
           chronic_duration (0.10.6)

     

       130
       135
        
             numerizer (~> 0.1.1)

     

       131
       136
        
           chunky_png (1.3.5)

     
···

       151
       156
        
           d3_rails (3.5.11)

     

       152
       157
        
             railties (>= 3.1.0)

     

       153
       158
        
           daemons (1.2.3)

     

       154
       154
       -
           database_cleaner (1.4.1)

     

       159
       159
       +
           database_cleaner (1.5.3)

     

       155
       160
        
           debug_inspector (0.0.2)

     

       156
       161
        
           debugger-ruby_core_source (1.3.8)

     

       157
       157
       -
           default_value_for (3.0.1)

     

       158
       158
       -
             activerecord (>= 3.2.0, < 5.0)

     

       162
       162
       +
           default_value_for (3.0.2)

     

       163
       163
       +
             activerecord (>= 3.2.0, < 5.1)

     

       159
       164
        
           descendants_tracker (0.0.4)

     

       160
       165
        
             thread_safe (~> 0.3, >= 0.3.1)

     

       161
       166
        
           devise (4.1.1)

     
···

       173
       178
        
           diff-lcs (1.2.5)

     

       174
       179
        
           diffy (3.0.7)

     

       175
       180
        
           docile (1.1.5)

     

       176
       176
       -
           doorkeeper (4.0.0)

     

       181
       181
       +
           doorkeeper (4.2.0)

     

       177
       182
        
             railties (>= 4.2)

     

       178
       183
        
           dropzonejs-rails (0.7.2)

     

       179
       184
        
             rails (> 3.1)

     
···

       276
       281
        
             diff-lcs (~> 1.1)

     

       277
       282
        
             mime-types (>= 1.16, < 3)

     

       278
       283
        
             posix-spawn (~> 0.3)

     

       279
       279
       -
           gitlab_git (10.3.2)

     

       284
       284
       +
           gitlab_git (10.4.7)

     

       280
       285
        
             activesupport (~> 4.0)

     

       281
       286
        
             charlock_holmes (~> 0.7.3)

     

       282
       287
        
             github-linguist (~> 4.7.0)

     
···

       301
       306
        
           gollum-rugged_adapter (0.4.2)

     

       302
       307
        
             mime-types (>= 1.15)

     

       303
       308
        
             rugged (~> 0.24.0, >= 0.21.3)

     

       304
       304
       -
           gon (6.0.1)

     

       309
       309
       +
           gon (6.1.0)

     

       305
       310
        
             actionpack (>= 3.0)

     

       306
       311
        
             json

     

       307
       312
        
             multi_json

     

       308
       313
        
             request_store (>= 1.0)

     

       309
       309
       -
           grape (0.13.0)

     

       314
       314
       +
           grape (0.15.0)

     

       310
       315
        
             activesupport

     

       311
       316
        
             builder

     

       312
       317
        
             hashie (>= 2.1.0)

     
···

       319
       324
        
           grape-entity (0.4.8)

     

       320
       325
        
             activesupport

     

       321
       326
        
             multi_json (>= 1.3.2)

     

       322
       322
       -
           hamlit (2.5.0)

     

       327
       327
       +
           hamlit (2.6.1)

     

       323
       328
        
             temple (~> 0.7.6)

     

       324
       329
        
             thor

     

       325
       330
        
             tilt

     
···

       333
       338
        
             activesupport (>= 2)

     

       334
       339
        
             nokogiri (~> 1.4)

     

       335
       340
        
           htmlentities (4.3.4)

     

       336
       336
       -
           http_parser.rb (0.5.3)

     

       337
       341
        
           httparty (0.13.7)

     

       338
       342
        
             json (~> 1.8)

     

       339
       343
        
             multi_xml (>= 0.5.2)

     

       340
       340
       -
           httpclient (2.7.0.1)

     

       344
       344
       +
           httpclient (2.8.2)

     

       341
       345
        
           i18n (0.7.0)

     

       342
       346
        
           ice_nine (0.11.1)

     

       343
       347
        
           influxdb (0.2.3)

     
···

       355
       359
        
           jquery-ui-rails (5.0.5)

     

       356
       360
        
             railties (>= 3.2.16)

     

       357
       361
        
           json (1.8.3)

     

       362
       362
       +
           json-schema (2.6.2)

     

       363
       363
       +
             addressable (~> 2.3.8)

     

       358
       364
        
           jwt (1.5.4)

     

       359
       365
        
           kaminari (0.17.0)

     

       360
       366
        
             actionpack (>= 3.0.0)

     
···

       402
       408
        
           nested_form (0.3.2)

     

       403
       409
        
           net-ldap (0.12.1)

     

       404
       410
        
           net-ssh (3.0.1)

     

       405
       405
       -
           newrelic_rpm (3.14.1.311)

     

       411
       411
       +
           newrelic_rpm (3.16.0.318)

     

       406
       412
        
           nokogiri (1.6.7.2)

     

       407
       413
        
             mini_portile2 (~> 2.0.0.rc2)

     

       414
       414
       +
             pkg-config (~> 1.1.7)

     

       408
       415
        
           numerizer (0.1.1)

     

       409
       416
        
           oauth (0.4.7)

     

       410
       417
        
           oauth2 (1.2.0)

     
···

       506
       513
        
           rack-cors (0.4.0)

     

       507
       514
        
           rack-mount (0.8.3)

     

       508
       515
        
             rack (>= 1.0.0)

     

       509
       509
       -
           rack-oauth2 (1.2.1)

     

       516
       516
       +
           rack-oauth2 (1.2.3)

     

       510
       517
        
             activesupport (>= 2.3)

     

       511
       518
        
             attr_required (>= 0.0.5)

     

       512
       519
        
             httpclient (>= 2.4)

     
···

       572
       579
        
             redis-store (~> 1.1.0)

     

       573
       580
        
           redis-store (1.1.7)

     

       574
       581
        
             redis (>= 2.2)

     

       575
       575
       -
           request_store (1.3.0)

     

       582
       582
       +
           request_store (1.3.1)

     

       576
       583
        
           rerun (0.11.0)

     

       577
       584
        
             listen (~> 3.0)

     

       578
       585
        
           responders (2.1.1)

     
···

       617
       624
        
             rubocop (>= 0.40.0)

     

       618
       625
        
           ruby-fogbugz (0.2.1)

     

       619
       626
        
             crack (~> 0.4)

     

       627
       627
       +
           ruby-prof (0.15.9)

     

       620
       628
        
           ruby-progressbar (1.8.1)

     

       621
       629
        
           ruby-saml (1.3.0)

     

       622
       630
        
             nokogiri (>= 1.5.10)

     
···

       668
       676
        
             redis-namespace (>= 1.5.2)

     

       669
       677
        
             rufus-scheduler (>= 2.0.24)

     

       670
       678
        
             sidekiq (>= 4.0.0)

     

       671
       671
       -
           simple_oauth (0.1.9)

     

       672
       672
       -
           simplecov (0.11.2)

     

       679
       679
       +
           simplecov (0.12.0)

     

       673
       680
        
             docile (~> 1.1.0)

     

       674
       674
       -
             json (~> 1.8)

     

       681
       681
       +
             json (>= 1.8, < 3)

     

       675
       682
        
             simplecov-html (~> 0.10.0)

     

       676
       683
        
           simplecov-html (0.10.0)

     

       677
       684
        
           sinatra (1.4.7)

     
···

       701
       708
        
           sprockets (3.6.3)

     

       702
       709
        
             concurrent-ruby (~> 1.0)

     

       703
       710
        
             rack (> 1, < 3)

     

       711
       711
       +
           sprockets-es6 (0.9.0)

     

       712
       712
       +
             babel-source (>= 5.8.11)

     

       713
       713
       +
             babel-transpiler

     

       714
       714
       +
             sprockets (>= 3.0.0)

     

       704
       715
        
           sprockets-rails (3.1.1)

     

       705
       716
        
             actionpack (>= 4.0)

     

       706
       717
        
             activesupport (>= 4.0)

     
···

       734
       745
        
           tilt (2.0.5)

     

       735
       746
        
           timecop (0.8.1)

     

       736
       747
        
           timfel-krb5-auth (0.8.3)

     

       737
       737
       -
           tinder (1.10.1)

     

       738
       738
       -
             eventmachine (~> 1.0)

     

       739
       739
       -
             faraday (~> 0.9.0)

     

       740
       740
       -
             faraday_middleware (~> 0.9)

     

       741
       741
       -
             hashie (>= 1.0)

     

       742
       742
       -
             json (~> 1.8.0)

     

       743
       743
       -
             mime-types

     

       744
       744
       -
             multi_json (~> 1.7)

     

       745
       745
       -
             twitter-stream (~> 0.1)

     

       746
       748
        
           turbolinks (2.5.3)

     

       747
       749
        
             coffee-rails

     

       748
       748
       -
           twitter-stream (0.1.16)

     

       749
       749
       -
             eventmachine (>= 0.12.8)

     

       750
       750
       -
             http_parser.rb (~> 0.5.1)

     

       751
       751
       -
             simple_oauth (~> 0.1.4)

     

       752
       750
        
           tzinfo (1.2.2)

     

       753
       751
        
             thread_safe (~> 0.1)

     

       754
       752
        
           u2f (0.2.1)

     
···

       767
       765
        
           unicorn-worker-killer (0.4.4)

     

       768
       766
        
             get_process_mem (~> 0)

     

       769
       767
        
             unicorn (>= 4, < 6)

     

       770
       770
       -
           uniform_notifier (1.9.0)

     

       768
       768
       +
           uniform_notifier (1.10.0)

     

       771
       769
        
           uuid (2.3.8)

     

       772
       770
        
             macaddr (~> 1.0)

     

       773
       773
       -
           version_sorter (2.0.0)

     

       771
       771
       +
           version_sorter (2.1.0)

     

       774
       772
        
           virtus (1.0.5)

     

       775
       773
        
             axiom-types (~> 0.1)

     

       776
       774
        
             coercible (~> 1.0)

     
···

       803
       801
        
       

     

       804
       802
        
       DEPENDENCIES

     

       805
       803
        
         RedCloth (~> 4.3.2)

     

       806
       806
       -
         ace-rails-ap (~> 4.0.2)

     

       804
       804
       +
         ace-rails-ap (~> 4.1.0)

     

       807
       805
        
         activerecord-nulldb-adapter

     

       808
       806
        
         activerecord-session_store (~> 1.0.0)

     

       809
       807
        
         acts-as-taggable-on (~> 3.4)

     
···

       823
       821
        
         bootstrap-sass (~> 3.3.0)

     

       824
       822
        
         brakeman (~> 3.3.0)

     

       825
       823
        
         browser (~> 2.2)

     

       826
       826
       -
         bullet (~> 5.0.0)

     

       824
       824
       +
         bullet (~> 5.2.0)

     

       827
       825
        
         bundler-audit (~> 0.5.0)

     

       828
       826
        
         byebug (~> 8.2.1)

     

       829
       827
        
         capybara (~> 2.6.2)

     

       830
       828
        
         capybara-screenshot (~> 1.0.0)

     

       831
       829
        
         carrierwave (~> 0.10.0)

     

       832
       830
        
         charlock_holmes (~> 0.7.3)

     

       831
       831
       +
         chronic (~> 0.10.2)

     

       833
       832
        
         chronic_duration (~> 0.10.6)

     

       834
       833
        
         coffee-rails (~> 4.1.0)

     

       835
       834
        
         connection_pool (~> 2.0)

     

       836
       835
        
         creole (~> 0.5.0)

     

       837
       836
        
         d3_rails (~> 3.5.0)

     

       838
       838
       -
         database_cleaner (~> 1.4.0)

     

       837
       837
       +
         database_cleaner (~> 1.5.0)

     

       839
       838
        
         default_value_for (~> 3.0.0)

     

       840
       839
        
         devise (~> 4.0)

     

       841
       840
        
         devise-two-factor (~> 3.0.0)

     

       842
       841
        
         diffy (~> 3.0.3)

     

       843
       843
       -
         doorkeeper (~> 4.0)

     

       842
       842
       +
         doorkeeper (~> 4.2.0)

     

       844
       843
        
         dropzonejs-rails (~> 0.7.1)

     

       845
       844
        
         email_reply_parser (~> 0.5.8)

     

       846
       845
        
         email_spec (~> 1.6.0)

     
···

       863
       862
        
         github-linguist (~> 4.7.0)

     

       864
       863
        
         github-markup (~> 1.4)

     

       865
       864
        
         gitlab-flowdock-git-hook (~> 1.0.1)

     

       866
       866
       -
         gitlab_git (~> 10.3.2)

     

       865
       865
       +
         gitlab_git (~> 10.4.7)

     

       867
       866
        
         gitlab_meta (= 7.0)

     

       868
       867
        
         gitlab_omniauth-ldap (~> 1.2.1)

     

       869
       868
        
         gollum-lib (~> 4.2)

     

       870
       869
        
         gollum-rugged_adapter (~> 0.4.2)

     

       871
       871
       -
         gon (~> 6.0.1)

     

       872
       872
       -
         grape (~> 0.13.0)

     

       870
       870
       +
         gon (~> 6.1.0)

     

       871
       871
       +
         grape (~> 0.15.0)

     

       873
       872
        
         grape-entity (~> 0.4.2)

     

       874
       874
       -
         hamlit (~> 2.5)

     

       873
       873
       +
         hamlit (~> 2.6.1)

     

       875
       874
        
         health_check (~> 2.1.0)

     

       876
       875
        
         hipchat (~> 1.5.0)

     

       877
       876
        
         html-pipeline (~> 1.11.0)

     
···

       881
       880
        
         jquery-rails (~> 4.1.0)

     

       882
       881
        
         jquery-turbolinks (~> 2.1.0)

     

       883
       882
        
         jquery-ui-rails (~> 5.0.0)

     

       883
       883
       +
         json-schema (~> 2.6.2)

     

       884
       884
        
         jwt

     

       885
       885
        
         kaminari (~> 0.17.0)

     

       886
       886
        
         knapsack (~> 1.11.0)

     
···

       895
       895
        
         mysql2 (~> 0.3.16)

     

       896
       896
        
         nested_form (~> 0.3.2)

     

       897
       897
        
         net-ssh (~> 3.0.1)

     

       898
       898
       -
         newrelic_rpm (~> 3.14)

     

       899
       899
       -
         nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8)

     

       898
       898
       +
         newrelic_rpm (~> 3.16)

     

       899
       899
       +
         nokogiri (~> 1.6.7, >= 1.6.7.2)

     

       900
       900
        
         oauth2 (~> 1.2.0)

     

       901
       901
        
         octokit (~> 4.3.0)

     

       902
       902
        
         omniauth (~> 1.3.1)

     
···

       942
       942
        
         rubocop (~> 0.41.2)

     

       943
       943
        
         rubocop-rspec (~> 1.5.0)

     

       944
       944
        
         ruby-fogbugz (~> 0.2.1)

     

       945
       945
       +
         ruby-prof (~> 0.15.9)

     

       945
       946
        
         sanitize (~> 2.0)

     

       946
       947
        
         sass-rails (~> 5.0.0)

     

       947
       948
        
         scss_lint (~> 0.47.0)

     
···

       954
       955
        
         shoulda-matchers (~> 2.8.0)

     

       955
       956
        
         sidekiq (~> 4.0)

     

       956
       957
        
         sidekiq-cron (~> 0.4.0)

     

       957
       957
       -
         simplecov (~> 0.11.0)

     

       958
       958
       +
         simplecov (= 0.12.0)

     

       958
       959
        
         sinatra (~> 1.4.4)

     

       959
       960
        
         six (~> 0.2.0)

     

       960
       961
        
         slack-notifier (~> 1.2.0)

     
···

       965
       966
        
         spring-commands-spinach (~> 1.1.0)

     

       966
       967
        
         spring-commands-teaspoon (~> 0.0.2)

     

       967
       968
        
         sprockets (~> 3.6.0)

     

       969
       969
       +
         sprockets-es6

     

       968
       970
        
         state_machines-activerecord (~> 0.4.0)

     

       969
       971
        
         sys-filesystem (~> 1.1.6)

     

       970
       972
        
         task_list (~> 1.0.2)

     
···

       972
       974
        
         teaspoon-jasmine (~> 2.2.0)

     

       973
       975
        
         test_after_commit (~> 0.4.2)

     

       974
       976
        
         thin (~> 1.7.0)

     

       975
       975
       -
         tinder (~> 1.10.0)

     

       976
       977
        
         turbolinks (~> 2.5.0)

     

       977
       978
        
         u2f (~> 0.2.1)

     

       978
       979
        
         uglifier (~> 2.7.2)

     
···

       980
       981
        
         unf (~> 0.1.4)

     

       981
       982
        
         unicorn (~> 4.9.0)

     

       982
       983
        
         unicorn-worker-killer (~> 0.4.2)

     

       983
       983
       -
         version_sorter (~> 2.0.0)

     

       984
       984
       +
         version_sorter (~> 2.1.0)

     

       984
       985
        
         virtus (~> 1.0.1)

     

       985
       986
        
         vmstat (~> 2.1.1)

     

       986
       987
        
         web-console (~> 2.0)

+2 -2

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

···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

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

     

       27
       27
       -
         version = "8.10.6";

     

       27
       27
       +
         version = "8.11.2";

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [ env ruby bundler tzdata git nodejs procps ];

     

       30
       30
        
       

     
···

       32
       32
        
           owner = "gitlabhq";

     

       33
       33
        
           repo = "gitlabhq";

     

       34
       34
        
           rev = "v${version}";

     

       35
       35
       -
           sha256 = "1nk0ak9p5ncqynrm965ypwb9bj7b1r2jy5g4vdb9b0ma1ns2bkzf";

     

       35
       35
       +
           sha256 = "1id6jsf4mshxis07dqlkgdyqi1v415rp4lx9ix8sjfznchria58b";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         patches = [

+82 -72

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

···

       2
       2
        
         ace-rails-ap = {

     

       3
       3
        
           source = {

     

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

     

       5
       5
       -
             sha256 = "1y1xdjmdb7fg1w0ym7xizpfvll8bicnhli2s65bzvpk3zp7h8qmi";

     

       5
       5
       +
             sha256 = "1jxpv0x8lzkk00v2pc13jxrcdigk4dv6pi3sa52j864ky8fk37rh";

     

       6
       6
        
             type = "gem";

     

       7
       7
        
           };

     

       8
       8
       -
           version = "4.0.2";

     

       8
       8
       +
           version = "4.1.0";

     

       9
       9
        
         };

     

       10
       10
        
         actionmailer = {

     

       11
       11
        
           source = {

     
···

       157
       157
        
         attr_encrypted = {

     

       158
       158
        
           source = {

     

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

     

       160
       160
       -
             sha256 = "0xqb753sjgwxpb2s375j8nkrk8kjhjijzywyl6vps5r3nbs0l51k";

     

       160
       160
       +
             sha256 = "1dikbf55wjqyzfb9p4xjkkkajwan569pmzljdf9c1fy4a94cd13d";

     

       161
       161
        
             type = "gem";

     

       162
       162
        
           };

     

       163
       163
       -
           version = "3.0.1";

     

       163
       163
       +
           version = "3.0.3";

     

       164
       164
        
         };

     

       165
       165
        
         attr_required = {

     

       166
       166
        
           source = {

     
···

       212
       212
        
           };

     

       213
       213
        
           version = "0.1.2";

     

       214
       214
        
         };

     

       215
       215
       +
         babel-source = {

     

       216
       216
       +
           source = {

     

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

     

       218
       218
       +
             sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr";

     

       219
       219
       +
             type = "gem";

     

       220
       220
       +
           };

     

       221
       221
       +
           version = "5.8.35";

     

       222
       222
       +
         };

     

       223
       223
       +
         babel-transpiler = {

     

       224
       224
       +
           source = {

     

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

     

       226
       226
       +
             sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc";

     

       227
       227
       +
             type = "gem";

     

       228
       228
       +
           };

     

       229
       229
       +
           version = "0.7.0";

     

       230
       230
       +
         };

     

       215
       231
        
         babosa = {

     

       216
       232
        
           source = {

     

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

     
···

       298
       314
        
         bullet = {

     

       299
       315
        
           source = {

     

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

     

       301
       301
       -
             sha256 = "14i3ci990sygxzdsy9jsgzfs5zkzgx6fd56i0d58s77wmn2myham";

     

       317
       317
       +
             sha256 = "1i242hsnkrjsk6bjrd0glhfdir0836iaqcqbz6hrxz4gqkh2rg2g";

     

       302
       318
        
             type = "gem";

     

       303
       319
        
           };

     

       304
       304
       -
           version = "5.0.0";

     

       320
       320
       +
           version = "5.2.0";

     

       305
       321
        
         };

     

       306
       322
        
         bundler-audit = {

     

       307
       323
        
           source = {

     
···

       360
       376
        
           };

     

       361
       377
        
           version = "0.7.3";

     

       362
       378
        
         };

     

       379
       379
       +
         chronic = {

     

       380
       380
       +
           source = {

     

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

     

       382
       382
       +
             sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";

     

       383
       383
       +
             type = "gem";

     

       384
       384
       +
           };

     

       385
       385
       +
           version = "0.10.2";

     

       386
       386
       +
         };

     

       363
       387
        
         chronic_duration = {

     

       364
       388
        
           source = {

     

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

     
···

       495
       519
        
         database_cleaner = {

     

       496
       520
        
           source = {

     

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

     

       498
       498
       -
             sha256 = "0n5r7kvsmknk876v3scdphfnvllr9157fa5q7j5fczg8j5qm6kf0";

     

       522
       522
       +
             sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj";

     

       499
       523
        
             type = "gem";

     

       500
       524
        
           };

     

       501
       501
       -
           version = "1.4.1";

     

       525
       525
       +
           version = "1.5.3";

     

       502
       526
        
         };

     

       503
       527
        
         debug_inspector = {

     

       504
       528
        
           source = {

     
···

       517
       541
        
           version = "1.3.8";

     

       518
       542
        
         };

     

       519
       543
        
         default_value_for = {

     

       520
       520
       -
           dependencies = ["activerecord"];

     

       521
       544
        
           source = {

     

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

     

       523
       523
       -
             sha256 = "1z4lrba4y1c3y0rxw8321qbwsb3nr6c2igrpksfvz93yhc9m6xm0";

     

       546
       546
       +
             sha256 = "014482mxjrc227fxv6vff6ccjr9dr0ydz52flxslsa7biq542k73";

     

       524
       547
        
             type = "gem";

     

       525
       548
        
           };

     

       526
       526
       -
           version = "3.0.1";

     

       549
       549
       +
           version = "3.0.2";

     

       527
       550
        
         };

     

       528
       551
        
         descendants_tracker = {

     

       529
       552
        
           dependencies = ["thread_safe"];

     
···

       577
       600
        
         doorkeeper = {

     

       578
       601
        
           source = {

     

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

     

       580
       580
       -
             sha256 = "0lillrbd2sy7zzni6a2kf3p09lfd0br831zzv22zsv4ffr6n1va1";

     

       603
       603
       +
             sha256 = "0hs8r280k7a1kibzxrhifjps880n43jfrybf4mqpffw669jrwk3v";

     

       581
       604
        
             type = "gem";

     

       582
       605
        
           };

     

       583
       583
       -
           version = "4.0.0";

     

       606
       606
       +
           version = "4.2.0";

     

       584
       607
        
         };

     

       585
       608
        
         dropzonejs-rails = {

     

       586
       609
        
           dependencies = ["rails"];

     
···

       935
       958
        
         gitlab_git = {

     

       936
       959
        
           source = {

     

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

     

       938
       938
       -
             sha256 = "00l5dv4k6q21yzxnviqh5ab6i2i6ajzlyjbwm1vgag7663wscny6";

     

       961
       961
       +
             sha256 = "0xcn55jwc3g53mcj1fjr6qfjcj0awba9lwgd1720d2hkpfiglsai";

     

       939
       962
        
             type = "gem";

     

       940
       963
        
           };

     

       941
       941
       -
           version = "10.3.2";

     

       964
       964
       +
           version = "10.4.7";

     

       942
       965
        
         };

     

       943
       966
        
         gitlab_meta = {

     

       944
       967
        
           source = {

     
···

       990
       1013
        
           version = "0.4.2";

     

       991
       1014
        
         };

     

       992
       1015
        
         gon = {

     

       993
       993
       -
           dependencies = ["actionpack" "json" "multi_json" "request_store"];

     

       994
       1016
        
           source = {

     

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

     

       996
       996
       -
             sha256 = "1f359cd9zsa4nrng35bij5skvjrj5ywn2dhmlg41b97vmza26bxr";

     

       1018
       1018
       +
             sha256 = "1jmf6ly9wfrg52xkk9qb4hlfn3zdmz62ivclhp4f424m39rd9ngz";

     

       997
       1019
        
             type = "gem";

     

       998
       1020
        
           };

     

       999
       999
       -
           version = "6.0.1";

     

       1021
       1021
       +
           version = "6.1.0";

     

       1000
       1022
        
         };

     

       1001
       1023
        
         grape = {

     

       1002
       1002
       -
           dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "rack" "rack-accept" "rack-mount" "virtus"];

     

       1003
       1024
        
           source = {

     

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

     

       1005
       1005
       -
             sha256 = "1dxfal5jspxq612jjkqbd7xgp5dswdyllbbfq6fj2m7s21pismmh";

     

       1026
       1026
       +
             sha256 = "13rbm0whhirpzn2n58kjyvqn9989vvipynlxsj1ihmwp8xsmcj1i";

     

       1006
       1027
        
             type = "gem";

     

       1007
       1028
        
           };

     

       1008
       1008
       -
           version = "0.13.0";

     

       1029
       1029
       +
           version = "0.15.0";

     

       1009
       1030
        
         };

     

       1010
       1031
        
         grape-entity = {

     

       1011
       1032
        
           dependencies = ["activesupport" "multi_json"];

     
···

       1019
       1040
        
         hamlit = {

     

       1020
       1041
        
           source = {

     

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

     

       1022
       1022
       -
             sha256 = "00360fr2kq9f31p6mq965z0lpb16vhji3mzgkywcsxym1z9srvwm";

     

       1043
       1043
       +
             sha256 = "0ph4kv2ddr538f9ni2fmk7aq38djv5am29r3m6y64adg52n6jma9";

     

       1023
       1044
        
             type = "gem";

     

       1024
       1045
        
           };

     

       1025
       1025
       -
           version = "2.5.0";

     

       1046
       1046
       +
           version = "2.6.1";

     

       1026
       1047
        
         };

     

       1027
       1048
        
         hashie = {

     

       1028
       1049
        
           source = {

     
···

       1066
       1087
        
           };

     

       1067
       1088
        
           version = "4.3.4";

     

       1068
       1089
        
         };

     

       1069
       1069
       -
         "http_parser.rb" = {

     

       1070
       1070
       -
           source = {

     

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

     

       1072
       1072
       -
             sha256 = "0fwf5d573j1sw52kz057dw0nx2wlivczmx6ybf6mk065n5g54kyn";

     

       1073
       1073
       -
             type = "gem";

     

       1074
       1074
       -
           };

     

       1075
       1075
       -
           version = "0.5.3";

     

       1076
       1076
       -
         };

     

       1077
       1090
        
         httparty = {

     

       1078
       1091
        
           dependencies = ["json" "multi_xml"];

     

       1079
       1092
        
           source = {

     
···

       1086
       1099
        
         httpclient = {

     

       1087
       1100
        
           source = {

     

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

     

       1089
       1089
       -
             sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c";

     

       1102
       1102
       +
             sha256 = "1pg15svk9lv5r7w1hxd87di6apsr9y009af3mm01xcaccvqj4j2d";

     

       1090
       1103
        
             type = "gem";

     

       1091
       1104
        
           };

     

       1092
       1092
       -
           version = "2.7.0.1";

     

       1105
       1105
       +
           version = "2.8.2";

     

       1093
       1106
        
         };

     

       1094
       1107
        
         i18n = {

     

       1095
       1108
        
           source = {

     
···

       1165
       1178
        
             type = "gem";

     

       1166
       1179
        
           };

     

       1167
       1180
        
           version = "1.8.3";

     

       1181
       1181
       +
         };

     

       1182
       1182
       +
         json-schema = {

     

       1183
       1183
       +
           source = {

     

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

     

       1185
       1185
       +
             sha256 = "15bva4w940ckan3q89in5f98s8zz77nxglylgm98697wa4fbfqp9";

     

       1186
       1186
       +
             type = "gem";

     

       1187
       1187
       +
           };

     

       1188
       1188
       +
           version = "2.6.2";

     

       1168
       1189
        
         };

     

       1169
       1190
        
         jwt = {

     

       1170
       1191
        
           source = {

     
···

       1389
       1410
        
         newrelic_rpm = {

     

       1390
       1411
        
           source = {

     

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

     

       1392
       1392
       -
             sha256 = "155aj845rxn8ikcs15gphr8svnsrki8wzps794ddbi90h0ypr319";

     

       1413
       1413
       +
             sha256 = "0l8dvg4frrj6a93kb2zawrlmy2bb9mh683pk4wnhgf4nddizzzsh";

     

       1393
       1414
        
             type = "gem";

     

       1394
       1415
        
           };

     

       1395
       1395
       -
           version = "3.14.1.311";

     

       1416
       1416
       +
           version = "3.16.0.318";

     

       1396
       1417
        
         };

     

       1397
       1418
        
         nokogiri = {

     

       1398
       1419
        
           source = {

     
···

       1743
       1764
        
           version = "0.8.3";

     

       1744
       1765
        
         };

     

       1745
       1766
        
         rack-oauth2 = {

     

       1746
       1746
       -
           dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];

     

       1747
       1767
        
           source = {

     

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

     

       1749
       1749
       -
             sha256 = "1szfnb74p5s7k0glpmiv16rfl4wx9mnrr7riapgpbcx163zzkxad";

     

       1769
       1769
       +
             sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";

     

       1750
       1770
        
             type = "gem";

     

       1751
       1771
        
           };

     

       1752
       1752
       -
           version = "1.2.1";

     

       1772
       1772
       +
           version = "1.2.3";

     

       1753
       1773
        
         };

     

       1754
       1774
        
         rack-protection = {

     

       1755
       1775
        
           dependencies = ["rack"];

     
···

       1960
       1980
        
         request_store = {

     

       1961
       1981
        
           source = {

     

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

     

       1963
       1963
       -
             sha256 = "1vw3vkgnpbpgzc1b4cg2ifn3rb5w7bvk62x9jfy9laz40816nvkn";

     

       1983
       1983
       +
             sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv";

     

       1964
       1984
        
             type = "gem";

     

       1965
       1985
        
           };

     

       1966
       1966
       -
           version = "1.3.0";

     

       1986
       1986
       +
           version = "1.3.1";

     

       1967
       1987
        
         };

     

       1968
       1988
        
         rerun = {

     

       1969
       1989
        
           dependencies = ["listen"];

     
···

       2105
       2125
        
             type = "gem";

     

       2106
       2126
        
           };

     

       2107
       2127
        
           version = "0.2.1";

     

       2128
       2128
       +
         };

     

       2129
       2129
       +
         ruby-prof = {

     

       2130
       2130
       +
           source = {

     

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

     

       2132
       2132
       +
             sha256 = "0qvz8yclvxch3bmwh7wmnb5h8jsbmb8jmqcf94jjrakpcs2sc072";

     

       2133
       2133
       +
             type = "gem";

     

       2134
       2134
       +
           };

     

       2135
       2135
       +
           version = "0.15.9";

     

       2108
       2136
        
         };

     

       2109
       2137
        
         ruby-progressbar = {

     

       2110
       2138
        
           source = {

     
···

       2303
       2331
        
             type = "gem";

     

       2304
       2332
        
           };

     

       2305
       2333
        
           version = "0.4.0";

     

       2306
       2306
       -
         };

     

       2307
       2307
       -
         simple_oauth = {

     

       2308
       2308
       -
           source = {

     

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

     

       2310
       2310
       -
             sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";

     

       2311
       2311
       -
             type = "gem";

     

       2312
       2312
       -
           };

     

       2313
       2313
       -
           version = "0.1.9";

     

       2314
       2334
        
         };

     

       2315
       2335
        
         simplecov = {

     

       2316
       2336
        
           source = {

     

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

     

       2318
       2318
       -
             sha256 = "1p0jhxwsv2ksk4hmp8qbhnr325z9fhs26z9y8in5v5c49y331qw2";

     

       2338
       2338
       +
             sha256 = "0ffhyrfnq2zm2mc1742a4hqy475g3qa1zf6yfldwg1ldh5sn3qbx";

     

       2319
       2339
        
             type = "gem";

     

       2320
       2340
        
           };

     

       2321
       2321
       -
           version = "0.11.2";

     

       2341
       2341
       +
           version = "0.12.0";

     

       2322
       2342
        
         };

     

       2323
       2343
        
         simplecov-html = {

     

       2324
       2344
        
           source = {

     
···

       2427
       2447
        
             type = "gem";

     

       2428
       2448
        
           };

     

       2429
       2449
        
           version = "3.6.3";

     

       2450
       2450
       +
         };

     

       2451
       2451
       +
         sprockets-es6 = {

     

       2452
       2452
       +
           source = {

     

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

     

       2454
       2454
       +
             sha256 = "17hjwpzkdg5dsgzky7hmaly2jih8867ya35855p3lxqpd3gyfpny";

     

       2455
       2455
       +
             type = "gem";

     

       2456
       2456
       +
           };

     

       2457
       2457
       +
           version = "0.9.0";

     

       2430
       2458
        
         };

     

       2431
       2459
        
         sprockets-rails = {

     

       2432
       2460
        
           source = {

     
···

       2575
       2603
        
           };

     

       2576
       2604
        
           version = "0.8.3";

     

       2577
       2605
        
         };

     

       2578
       2578
       -
         tinder = {

     

       2579
       2579
       -
           dependencies = ["eventmachine" "faraday" "faraday_middleware" "hashie" "json" "mime-types" "multi_json" "twitter-stream"];

     

       2580
       2580
       -
           source = {

     

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

     

       2582
       2582
       -
             sha256 = "1kwj0wd540wb2ws86d3jdva175dx00w2j8lyrvbb6qli3g27byd7";

     

       2583
       2583
       -
             type = "gem";

     

       2584
       2584
       -
           };

     

       2585
       2585
       -
           version = "1.10.1";

     

       2586
       2586
       -
         };

     

       2587
       2606
        
         turbolinks = {

     

       2588
       2607
        
           dependencies = ["coffee-rails"];

     

       2589
       2608
        
           source = {

     
···

       2592
       2611
        
             type = "gem";

     

       2593
       2612
        
           };

     

       2594
       2613
        
           version = "2.5.3";

     

       2595
       2595
       -
         };

     

       2596
       2596
       -
         twitter-stream = {

     

       2597
       2597
       -
           dependencies = ["eventmachine" "http_parser.rb" "simple_oauth"];

     

       2598
       2598
       -
           source = {

     

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

     

       2600
       2600
       -
             sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";

     

       2601
       2601
       -
             type = "gem";

     

       2602
       2602
       -
           };

     

       2603
       2603
       -
           version = "0.1.16";

     

       2604
       2614
        
         };

     

       2605
       2615
        
         tzinfo = {

     

       2606
       2616
        
           dependencies = ["thread_safe"];

     
···

       2681
       2691
        
         uniform_notifier = {

     

       2682
       2692
        
           source = {

     

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

     

       2684
       2684
       -
             sha256 = "009z60qx01am7klmrca8pcladrynljra3a9smifn9f81r4dc7q63";

     

       2694
       2694
       +
             sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";

     

       2685
       2695
        
             type = "gem";

     

       2686
       2696
        
           };

     

       2687
       2687
       -
           version = "1.9.0";

     

       2697
       2697
       +
           version = "1.10.0";

     

       2688
       2698
        
         };

     

       2689
       2699
        
         uuid = {

     

       2690
       2700
        
           dependencies = ["macaddr"];

     
···

       2698
       2708
        
         version_sorter = {

     

       2699
       2709
        
           source = {

     

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

     

       2701
       2701
       -
             sha256 = "1lad9c43w2xfzmva57ia6glpmhyivyk1m79jli42canshvan5v6y";

     

       2711
       2711
       +
             sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";

     

       2702
       2712
        
             type = "gem";

     

       2703
       2713
        
           };

     

       2704
       2704
       -
           version = "2.0.0";

     

       2714
       2714
       +
           version = "2.1.0";

     

       2705
       2715
        
         };

     

       2706
       2716
        
         virtus = {

     

       2707
       2717
        
           dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];

+10 -20

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

···

       1
       1
        
       diff --git a/Gemfile b/Gemfile

     

       2
       2
       -
       index 92e666c..f97c991 100644

     

       2
       2
       +
       index 68547b6..60aaf99 100644

     

       3
       3
        
       --- a/Gemfile

     

       4
       4
        
       +++ b/Gemfile

     

       5
       5
       -
       @@ -117,7 +117,7 @@ gem 'rouge',         '~> 2.0'

     

       5
       5
       +
       @@ -118,7 +118,7 @@ gem 'rouge',         '~> 2.0'

     

       6
       6
        
        

     

       7
       7
        
        # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s

     

       8
       8
        
        # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM

     
···

       11
       11
        
        

     

       12
       12
        
        # Diffs

     

       13
       13
        
        gem 'diffy', '~> 3.0.3'

     

       14
       14
       -
       @@ -349,3 +349,5 @@ gem 'health_check', '~> 2.1.0'

     

       14
       14
       +
       @@ -351,3 +351,5 @@ gem 'health_check', '~> 2.1.0'

     

       15
       15
        
        # System information

     

       16
       16
        
        gem 'vmstat', '~> 2.1.1'

     

       17
       17
        
        gem 'sys-filesystem', '~> 1.1.6'

     

       18
       18
        
       +

     

       19
       19
        
       +gem "activerecord-nulldb-adapter"

     

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

     

       21
       21
       -
       index e2b3d55..23a5454 100644

     

       21
       21
       +
       index 5511d71..38d357e 100644

     

       22
       22
        
       --- a/Gemfile.lock

     

       23
       23
        
       +++ b/Gemfile.lock

     

       24
       24
        
       @@ -32,6 +32,8 @@ GEM

     
···

       30
       30
        
            activerecord-session_store (1.0.0)

     

       31
       31
        
              actionpack (>= 4.0, < 5.1)

     

       32
       32
        
              activerecord (>= 4.0, < 5.1)

     

       33
       33
       -
       @@ -390,7 +392,7 @@ GEM

     

       33
       33
       +
       @@ -396,7 +398,7 @@ GEM

     

       34
       34
        
            method_source (0.8.2)

     

       35
       35
        
            mime-types (2.99.2)

     

       36
       36
        
            mimemagic (0.3.0)

     
···

       39
       39
        
            minitest (5.7.0)

     

       40
       40
        
            mousetrap-rails (1.4.6)

     

       41
       41
        
            multi_json (1.12.1)

     

       42
       42
       -
       @@ -401,9 +403,8 @@ GEM

     

       42
       42
       +
       @@ -407,8 +409,8 @@ GEM

     

       43
       43
        
            net-ldap (0.12.1)

     

       44
       44
        
            net-ssh (3.0.1)

     

       45
       45
       -
            newrelic_rpm (3.14.1.311)

     

       45
       45
       +
            newrelic_rpm (3.16.0.318)

     

       46
       46
        
       -    nokogiri (1.6.8)

     

       47
       47
        
       -      mini_portile2 (~> 2.1.0)

     

       48
       48
       -
       -      pkg-config (~> 1.1.7)

     

       49
       48
        
       +    nokogiri (1.6.7.2)

     

       50
       49
        
       +      mini_portile2 (~> 2.0.0.rc2)

     

       50
       50
       +
              pkg-config (~> 1.1.7)

     

       51
       51
        
            numerizer (0.1.1)

     

       52
       52
        
            oauth (0.4.7)

     

       53
       53
       -
            oauth2 (1.2.0)

     

       54
       54
       -
       @@ -803,6 +803,7 @@ PLATFORMS

     

       53
       53
       +
       @@ -800,6 +802,7 @@ PLATFORMS

     

       55
       54
        
        DEPENDENCIES

     

       56
       55
        
          RedCloth (~> 4.3.2)

     

       57
       57
       -
          ace-rails-ap (~> 4.0.2)

     

       56
       56
       +
          ace-rails-ap (~> 4.1.0)

     

       58
       57
        
       +  activerecord-nulldb-adapter

     

       59
       58
        
          activerecord-session_store (~> 1.0.0)

     

       60
       59
        
          acts-as-taggable-on (~> 3.4)

     

       61
       60
        
          addressable (~> 2.3.8)

     

       62
       62
       -
       @@ -894,7 +895,7 @@ DEPENDENCIES

     

       63
       63
       -
          nested_form (~> 0.3.2)

     

       64
       64
       -
          net-ssh (~> 3.0.1)

     

       65
       65
       -
          newrelic_rpm (~> 3.14)

     

       66
       66
       -
       -  nokogiri (~> 1.6.7, >= 1.6.7.2)

     

       67
       67
       -
       +  nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8)

     

       68
       68
       -
          oauth2 (~> 1.2.0)

     

       69
       69
       -
          octokit (~> 4.3.0)

     

       70
       70
       -
          omniauth (~> 1.3.1)