diff options
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
5 files changed, 510 insertions, 579 deletions
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 89febc9bc0c2..f14e05d43e06 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -6,7 +6,7 @@ end gem_versions = {} gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' -gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10' +gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' # --- The end of special code for migrating to Rails 5.0 --- @@ -28,14 +28,14 @@ gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -gem 'grape-route-helpers', '~> 2.1.0' +gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.4' gem 'doorkeeper', '~> 4.3' -gem 'doorkeeper-openid_connect', '~> 1.3' +gem 'doorkeeper-openid_connect', '~> 1.5' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' @@ -47,10 +47,10 @@ gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' -gem 'omniauth-shibboleth', '~> 1.2.0' +gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' -gem 'omniauth-authentiq', '~> 0.3.1' +gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' @@ -68,7 +68,7 @@ gem 'u2f', '~> 0.2.1' gem 'validates_hostname', '~> 1.0.6' # Browser detection -gem 'browser', '~> 2.2' +gem 'browser', '~> 2.5' # GPG gem 'gpgme' @@ -93,6 +93,10 @@ gem 'grape', '~> 1.0' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' +# GraphQL API +gem 'graphql', '~> 1.8.0' +gem 'graphiql-rails', '~> 1.4.10' + # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -100,10 +104,13 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.6.1' +gem 'hamlit', '~> 2.8.8' # Files attachments -gem 'carrierwave', '~> 1.2' +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. +# config/initializers/carrierwave_patch.rb can be removed once that change is released. +gem 'carrierwave', '= 1.2.3' +gem 'mini_magick' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -111,14 +118,14 @@ gem 'dropzonejs-rails', '~> 0.7.1' # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.3.3' +gem 'fog-google', '~> 1.7.1' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.19.8' +gem 'google-api-client', '~> 0.23' # for aws storage gem 'unf', '~> 0.1.4' @@ -127,13 +134,13 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.7.1' +gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.2' +gem 'gitlab-markup', '~> 1.6.4' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -144,6 +151,9 @@ gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' gem 'nokogiri', '~> 1.8.2' +# Calendar rendering +gem 'icalendar' + # Diffs gem 'diffy', '~> 3.1.0' @@ -160,9 +170,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.0' +gem 'sidekiq', '~> 5.1' gem 'sidekiq-cron', '~> 0.6.0' -gem 'redis-namespace', '~> 1.5.2' +gem 'redis-namespace', '~> 1.6.0' gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser @@ -172,7 +182,10 @@ gem 'rufus-scheduler', '~> 3.4' gem 'httparty', '~> 0.13.3' # Colored output to console -gem 'rainbow', '~> 2.2' +gem 'rainbow', '~> 3.0' + +# Progress bar +gem 'ruby-progressbar' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -184,6 +197,9 @@ gem 're2', '~> 1.1.1' gem 'version_sorter', '~> 2.1.0' +# Export Ruby Regex to Javascript +gem 'js_regex', '~> 2.2.1' + # User agent parsing gem 'device_detector' @@ -203,12 +219,12 @@ gem 'jira-ruby', '~> 1.4' # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -# Gemnasium integration -gem 'gemnasium-gitlab-service', '~> 0.2' - # Slack integration gem 'slack-notifier', '~> 1.5.1' +# Hangouts Chat integration +gem 'hangouts-chat', '~> 0.0.5' + # Asana integration gem 'asana', '~> 0.6.0' @@ -216,13 +232,10 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 3.0' - -# d3 -gem 'd3_rails', '~> 3.5.0' +gem 'kubeclient', '~> 3.1.0' # Sanitize user input -gem 'sanitize', '~> 2.0' +gem 'sanitize', '~> 4.6' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input @@ -257,10 +270,9 @@ gem 'sass-rails', '~> 5.0.6' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' -gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' -gem 'gon', '~> 6.1.0' +gem 'gon', '~> 6.2' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' @@ -292,12 +304,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do - gem 'allocations', '~> 1.0', require: false, platform: :mri gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.1' + gem 'prometheus-client-mmap', '~> 0.9.4' gem 'raindrops', '~> 0.18' end @@ -317,19 +328,18 @@ group :development do end group :development, :test do + gem 'bootsnap', '~> 1.3' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-rails', '~> 0.3.4' - gem 'awesome_print', '~> 1.2.0', require: false + gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.5.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.6.0' + gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' - gem 'spinach-rails', '~> 0.2.1' - gem 'spinach-rerun-reporter', '~> 0.0.2' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' gem 'rspec-parameterized', require: false @@ -342,26 +352,24 @@ group :development, :test do gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'selenium-webdriver', '~> 3.5' + gem 'selenium-webdriver', '~> 3.12' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.1.0' - gem 'gitlab-styles', '~> 2.3', require: false + gem 'gitlab-styles', '~> 2.4', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.52.1' + gem 'rubocop', '~> 0.54.0' gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.26.0', require: false gem 'simplecov', '~> 0.14.0', require: false - gem 'flay', '~> 2.10.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 3.1', require: false + gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.16' gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] @@ -375,7 +383,7 @@ end group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false - gem 'email_spec', '~> 1.6.0' + gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' gem 'rails-controller-testing' if rails5? # Rails5 only gem. @@ -383,9 +391,10 @@ group :test do gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' + gem 'rspec_junit_formatter' end -gem 'octokit', '~> 4.8' +gem 'octokit', '~> 4.9' gem 'mail_room', '~> 0.9.1' @@ -393,6 +402,7 @@ gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' gem 'ruby-prof', '~> 0.17.0' +gem 'rbtrace', '~> 0.4', require: false # OAuth gem 'oauth2', '~> 1.4' @@ -405,18 +415,17 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 4.2.0' +gem 'net-ssh', '~> 5.0' gem 'sshkey', '~> 1.9.0' # Required for ED25519 SSH host key support group :ed25519 do - gem 'rbnacl-libsodium' - gem 'rbnacl', '~> 4.0' + gem 'ed25519', '~> 1.2' gem 'bcrypt_pbkdf', '~> 1.0' end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed @@ -434,4 +443,4 @@ gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' # Asset synchronization -gem 'asset_sync', '~> 2.2.0' +gem 'asset_sync', '~> 2.4' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 2a63ee6a5328..e41719ec79d3 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -49,7 +49,6 @@ GEM public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) akismet (2.0.0) - allocations (1.0.5) arel (6.0.4) asana (0.6.0) faraday (~> 0.9) @@ -59,7 +58,7 @@ GEM asciidoctor (1.5.6.2) asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) - asset_sync (2.2.0) + asset_sync (2.4.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -69,10 +68,7 @@ GEM attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.0) - autoprefixer-rails (6.2.3) - execjs - json - awesome_print (1.2.0) + awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -80,7 +76,7 @@ GEM babosa (1.0.2) base32 (0.3.2) batch-loader (1.2.1) - bcrypt (3.1.11) + bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) better_errors (2.1.1) @@ -90,13 +86,11 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blankslate (2.1.2.4) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + bootsnap (1.3.1) + msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) - browser (2.2.0) + browser (2.5.3) builder (3.2.3) bullet (5.5.1) activesupport (>= 3.0.0) @@ -115,24 +109,23 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.2.1) + carrierwave (1.2.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.6) - childprocess (0.7.0) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) chunky_png (1.3.5) citrus (3.0.2) - coderay (1.1.1) + coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) - colorize (0.7.7) - commonmarker (0.17.8) + commonmarker (0.17.13) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -147,8 +140,6 @@ GEM creole (0.5.0) css_parser (1.5.0) addressable - d3_rails (3.5.11) - railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.5.3) debug_inspector (0.0.2) @@ -177,19 +168,21 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) doorkeeper (4.3.2) railties (>= 4.2) - doorkeeper-openid_connect (1.3.0) + doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) rails (> 3.1) + ed25519 (1.2.4) email_reply_trimmer (0.1.6) - email_spec (1.6.0) + email_spec (2.2.0) + htmlentities (~> 4.3.3) launchy (~> 2.1) - mail (~> 2.2) + mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) erubis (2.7.0) @@ -197,7 +190,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.60.0) + excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) factory_bot (4.8.2) @@ -215,12 +208,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.4.0) - ffi (1.9.18) - flay (2.10.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) + ffi (1.9.25) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -245,11 +233,11 @@ GEM builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.3.3) + fog-google (1.7.1) fog-core fog-json fog-xml - google-api-client (~> 0.19.1) + google-api-client (~> 0.23.0) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -275,8 +263,6 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) gemojione (3.3.0) json get_process_mem (0.2.0) @@ -290,8 +276,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gherkin-ruby (0.3.2) - gitaly-proto (0.99.0) + gitaly-proto (0.117.0) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -304,15 +289,15 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-gollum-lib (4.2.7.2) + gitlab-gollum-lib (4.2.7.5) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (>= 1.6.1, < 2.0) rouge (~> 3.1) - sanitize (~> 2.1) + sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4) + gitlab-gollum-rugged_adapter (0.4.4.1) mime-types (>= 1.15) rugged (~> 0.25) gitlab-grit (2.8.2) @@ -320,9 +305,9 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.3) - gitlab-styles (2.3.2) - rubocop (~> 0.51) + gitlab-markup (1.6.4) + gitlab-styles (2.4.1) + rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) gitlab_omniauth-ldap (2.0.4) @@ -334,12 +319,11 @@ GEM activesupport (>= 4.2.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gon (6.1.0) + gon (6.2.0) actionpack (>= 3.0) - json multi_json request_store (>= 1.0) - google-api-client (0.19.8) + google-api-client (0.23.4) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) @@ -359,7 +343,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.2) + grape (1.0.3) activesupport builder mustermann-grape (~> 1.0.0) @@ -369,17 +353,22 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-route-helpers (2.1.0) - activesupport - grape (>= 0.16.0) - rake + grape-path-helpers (1.0.6) + activesupport (>= 4, < 5.1) + grape (~> 1.0) + rake (~> 12) grape_logging (1.7.0) grape + graphiql-rails (1.4.10) + railties + sprockets-rails + graphql (1.8.1) grpc (1.11.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) - haml (4.0.7) + haml (5.0.4) + temple (>= 0.8.0) tilt haml_lint (0.26.0) haml (>= 4.0, < 5.1) @@ -387,10 +376,11 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.1) - temple (~> 0.7.6) + hamlit (2.8.8) + temple (>= 0.8.0) thor tilt + hangouts-chat (0.0.5) hashdiff (0.3.4) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) @@ -400,7 +390,7 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (2.7.1) + html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -421,6 +411,7 @@ GEM httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) + icalendar (2.4.1) ice_nine (0.11.2) influxdb (0.2.3) cause @@ -431,13 +422,13 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) + js_regex (2.2.1) + regexp_parser (>= 0.4.11, <= 0.5.0) json (1.8.6) - json-jwt (1.9.2) + json-jwt (1.9.4) activesupport aes_key_wrap bindata - securecompare - url_safe_base64 json-schema (2.8.0) addressable (>= 2.4) jwt (1.5.6) @@ -456,10 +447,9 @@ GEM kgio (2.10.0) knapsack (1.16.0) rake - timecop (>= 0.1.0) - kubeclient (3.0.0) + kubeclient (3.1.0) http (~> 2.2.2) - recursive-open-struct (~> 1.0.4) + recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) @@ -469,13 +459,12 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (3.1.1) + license_finder (5.4.0) bundler - httparty rubyzip thor - toml (= 0.1.2) - with_env (> 1.0) + toml (= 0.2.0) + with_env (= 1.1.0) xml-simple licensee (8.9.2) rugged (~> 0.24) @@ -498,15 +487,17 @@ GEM memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) + mini_magick (4.8.0) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) + msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -515,10 +506,12 @@ GEM mustermann (~> 1.0.0) mysql2 (0.4.10) net-ldap (0.16.0) - net-ssh (4.2.0) + net-ssh (5.0.1) netrc (0.11.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) + nokogumbo (1.5.0) + nokogiri numerizer (0.1.1) oauth (0.5.4) oauth2 (1.4.0) @@ -527,15 +520,16 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) - omniauth-authentiq (0.3.1) - omniauth-oauth2 (~> 1.3, >= 1.3.1) + omniauth-authentiq (0.3.3) + jwt (>= 1.5) + omniauth-oauth2 (>= 1.5) omniauth-azure-oauth2 (0.0.9) jwt (~> 1.0) omniauth (~> 1.0) @@ -549,7 +543,7 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.5.3) @@ -572,7 +566,7 @@ GEM omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) - omniauth-shibboleth (1.2.1) + omniauth-shibboleth (1.3.0) omniauth (>= 1.0.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) @@ -588,9 +582,7 @@ GEM parallel (1.12.1) parser (2.5.1.0) ast (~> 2.4.0) - parslet (1.5.0) - blankslate (~> 2.0) - path_expander (1.0.2) + parslet (1.8.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -634,13 +626,12 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.1) - pry (0.10.4) + prometheus-client-mmap (0.9.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.4.3) + byebug (>= 9.0, < 9.1) pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) @@ -691,8 +682,7 @@ GEM activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) raindrops (0.18.0) rake (12.3.1) rb-fsevent (0.10.2) @@ -700,16 +690,15 @@ GEM ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbnacl (4.0.2) - ffi - rbnacl-libsodium (1.0.11) - rbnacl (>= 3.0.1) - rdoc (4.2.2) - json (~> 1.4) + rbtrace (0.4.10) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + trollop (>= 1.16.2) + rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json - recursive-open-struct (1.0.5) + recursive-open-struct (1.1.0) redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) @@ -719,8 +708,8 @@ GEM redis-activesupport (5.0.4) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) + redis-namespace (1.6.0) + redis (>= 3.0.4) redis-rack (2.0.4) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) @@ -730,6 +719,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.4.1) redis (>= 2.2, < 5) + regexp_parser (0.5.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -742,59 +732,62 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.1.1) + retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.1.1) + rouge (3.2.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) + rspec-support (~> 3.7.0) rspec-parameterized (0.4.0) binding_of_caller parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.6.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) rspec-retry (0.4.5) rspec-core rspec-set (0.1.3) - rspec-support (3.6.0) + rspec-support (3.7.1) + rspec_junit_formatter (0.2.3) + builder (< 4) + rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) activerecord pg rails sqlite3 - rubocop (0.52.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-rspec (1.22.1) + rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) i18n @@ -808,13 +801,15 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.2.1) + rubyzip (1.2.2) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.27.0) + rugged (0.27.4) safe_yaml (1.0.4) - sanitize (2.1.0) + sanitize (4.6.6) + crass (~> 1.0.2) nokogiri (>= 1.4.4) + nokogumbo (~> 1.4) sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -832,15 +827,14 @@ GEM scss_lint (0.56.0) rake (>= 0.9, < 13) sass (~> 3.5.3) - securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) - selenium-webdriver (3.5.0) + selenium-webdriver (3.12.0) childprocess (~> 0.5) - rubyzip (~> 1.0) + rubyzip (~> 1.2) sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -849,11 +843,11 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.5) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (>= 3.3.4, < 5) + redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) @@ -871,24 +865,11 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) spring (2.0.1) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -909,7 +890,7 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - temple (0.7.7) + temple (0.8.0) test-prof (0.2.5) test_after_commit (1.1.0) activerecord (>= 3.2) @@ -920,13 +901,14 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) - toml (0.1.2) - parslet (~> 1.5.0) + toml (0.2.0) + parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + trollop (2.1.3) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) @@ -940,7 +922,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.0) + unicode-display_width (1.3.2) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -956,7 +938,6 @@ GEM equalizer (~> 0.0.9) parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) - url_safe_base64 (0.2.2) validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) @@ -994,13 +975,12 @@ DEPENDENCIES acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) - allocations (~> 1.0) asana (~> 0.6.0) asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) - asset_sync (~> 2.2.0) + asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) - awesome_print (~> 1.2.0) + awesome_print babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.2.1) @@ -1008,15 +988,15 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) + bootsnap (~> 1.3) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) - browser (~> 2.2) + browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) capybara (~> 2.15) capybara-screenshot (~> 1.0.0) - carrierwave (~> 1.2) + carrierwave (= 1.2.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -1024,7 +1004,6 @@ DEPENDENCIES concurrent-ruby (~> 1.0.5) connection_pool (~> 2.0) creole (~> 0.5.0) - d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) deckar01-task_list (= 2.0.0) default_value_for (~> 3.0.0) @@ -1033,84 +1012,89 @@ DEPENDENCIES devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) doorkeeper (~> 4.3) - doorkeeper-openid_connect (~> 1.3) + doorkeeper-openid_connect (~> 1.5) dropzonejs-rails (~> 0.7.1) + ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) - email_spec (~> 1.6.0) + email_spec (~> 2.2.0) factory_bot_rails (~> 4.8.2) faraday (~> 0.12) fast_blank ffaker (~> 2.4) - flay (~> 2.10.0) flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) fog-aws (~> 2.0.1) fog-core (~> 1.44) - fog-google (~> 1.3.3) + fog-google (~> 1.7.1) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) fuubar (~> 2.2.0) - gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.99.0) + gitaly-proto (~> 0.117.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.2) - gitlab-styles (~> 2.3) + gitlab-markup (~> 1.6.4) + gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) - gon (~> 6.1.0) - google-api-client (~> 0.19.8) + gon (~> 6.2) + google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.7.1) - grape-route-helpers (~> 2.1.0) + grape-path-helpers (~> 1.0) grape_logging (~> 1.7) + graphiql-rails (~> 1.4.10) + graphql (~> 1.8.0) grpc (~> 1.11.0) haml_lint (~> 0.26.0) - hamlit (~> 2.6.1) + hamlit (~> 2.8.8) + hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.7.1) + html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) + icalendar influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) + js_regex (~> 2.2.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.16) - kubeclient (~> 3.0) + kubeclient (~> 3.1.0) letter_opener_web (~> 1.3.0) - license_finder (~> 3.1) + license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) method_source (~> 0.8) + mini_magick minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap - net-ssh (~> 4.2.0) + net-ssh (~> 5.0) nokogiri (~> 1.8.2) oauth2 (~> 1.4) - octokit (~> 4.8) + octokit (~> 4.9) omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) - omniauth-authentiq (~> 0.3.1) + omniauth-authentiq (~> 0.3.3) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) @@ -1120,7 +1104,7 @@ DEPENDENCIES omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) - omniauth-shibboleth (~> 1.2.0) + omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) @@ -1133,7 +1117,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.1) + prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) @@ -1143,55 +1127,53 @@ DEPENDENCIES rails (= 4.2.10) rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) - rainbow (~> 2.2) + rainbow (~> 3.0) raindrops (~> 0.18) rblineprof (~> 0.3.6) - rbnacl (~> 4.0) - rbnacl-libsodium - rdoc (~> 4.2) + rbtrace (~> 0.4) + rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) redcarpet (~> 3.4) redis (~> 3.2) - redis-namespace (~> 1.5.2) + redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) rouge (~> 3.1) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.6.0) + rspec-rails (~> 3.7.0) rspec-retry (~> 0.4.5) rspec-set (~> 0.1.3) + rspec_junit_formatter rspec_profiling (~> 0.0.5) - rubocop (~> 0.52.1) + rubocop (~> 0.54.0) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.17.0) + ruby-progressbar ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) rugged (~> 0.27) - sanitize (~> 2.0) + sanitize (~> 4.6) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) - selenium-webdriver (~> 3.5) + selenium-webdriver (~> 3.12) sentry-raven (~> 2.7) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.0) + sidekiq (~> 5.1) sidekiq-cron (~> 0.6.0) sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) sshkey (~> 1.9.0) stackprof (~> 0.2.10) @@ -1217,4 +1199,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.1 + 1.16.4 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 64e0ef2b59d0..98e2e739e0d7 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv +{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, procps, nettools +, gitlabEnterprise ? false }: let @@ -8,40 +9,46 @@ let inherit ruby; gemdir = ./.; groups = [ "default" "unicorn" "ed25519" "metrics" ]; - meta = with lib; { - homepage = http://www.gitlab.com/; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; - license = licenses.mit; - }; }; - version = "10.8.0"; + version = "11.3.0"; - gitlabDeb = fetchurl { - url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0j5jrlwfpgwfirjnqb9w4snl9w213kdxb1ajyrla211q603d4j34"; + sources = if gitlabEnterprise then { + gitlabDeb = fetchurl { + url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; + sha256 = "1l5cfbc45xa3gq90wyly3szn93szh162g9szc6dnkqx0db70j9l3"; + }; + gitlab = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-ee"; + rev = "v${version}-ee"; + sha256 = "0gmainjhs21hipbvshga5dzkjrpmlkk9vxxnxgwjaqbg9wrhw47m"; + }; + } else { + gitlabDeb = fetchurl { + url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; + sha256 = "162xy8xpa2qhz10nh2dw0vbd0665pz9984vnim9i30xcafr5picq"; + }; + gitlab = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-ce"; + rev = "v${version}"; + sha256 = "158n2qnp1zsj5kk2w3v9xyakgdb739n955hlq3i9sl80q8f4xda3"; + }; }; in stdenv.mkDerivation rec { - name = "gitlab-${version}"; + name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}"; - src = fetchFromGitHub { - owner = "gitlabhq"; - repo = "gitlabhq"; - rev = "v${version}"; - sha256 = "1idvi27xpghvvb3sv62afhcnnswvjlrbg5lld79a761kd4187cym"; - }; + src = sources.gitlab; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools ]; - patches = [ - ./remove-hardcoded-locations.patch - ]; + patches = [ ./remove-hardcoded-locations.patch ]; postPatch = '' # For reasons I don't understand "bundle exec" ignores the @@ -72,13 +79,14 @@ stdenv.mkDerivation rec { buildPhase = '' mv config/gitlab.yml.example config/gitlab.yml - # work around unpacking deb containing binary with suid bit - ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar + # Building this requires yarn, node &c, so we just get it from the deb + ar p ${sources.gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar + # Work around unpacking deb containing binary with suid bit tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu tar -xf gitlab-deb-data.tar mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public - rm -rf opt + rm -rf opt # only directory in data.tar.gz mv config/gitlab.yml config/gitlab.yml.example rm -f config/secrets.yml @@ -105,10 +113,19 @@ stdenv.mkDerivation rec { ruby = rubyEnv.wrappedRuby; }; - meta = with stdenv.lib; { - description = "Web-based Git-repository manager"; - homepage = https://gitlab.com; - license = licenses.mit; + meta = with lib; { + homepage = http://www.gitlab.com/; platforms = platforms.linux; - }; + maintainers = with maintainers; [ fpletz globin krav ]; + } // (if gitlabEnterprise then + { + license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE + description = "GitLab Enterprise Edition"; + } + else + { + license = licenses.mit; + description = "GitLab Community Edition"; + longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider."; + }); } diff --git a/pkgs/applications/version-management/gitlab/fix-36783.patch b/pkgs/applications/version-management/gitlab/fix-36783.patch deleted file mode 100644 index 64301fa2c526..000000000000 --- a/pkgs/applications/version-management/gitlab/fix-36783.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/app/workers/post_receive.rb -+++ b/app/workers/post_receive.rb -@@ -3,7 +3,9 @@ class PostReceive - include DedicatedSidekiqQueue - - def perform(gl_repository, identifier, changes) -- project, is_wiki = Gitlab::GlRepository.parse(gl_repository) -+ # XXX: https://gitlab.com/gitlab-org/gitlab-ce/issues/36783 -+ # project, is_wiki = Gitlab::GlRepository.parse(gl_repository) -+ project, is_wiki = parse_project_identifier(gl_repository) - - if project.nil? - log("Triggered hook for non-existing project with gl_repository \"#{gl_repository}\"") -@@ -59,6 +61,15 @@ class PostReceive - # Nothing defined here yet. - end - -+ # XXX: https://gitlab.com/gitlab-org/gitlab-ce/issues/36783 -+ def parse_project_identifier(project_identifier) -+ if project_identifier.start_with?('/') -+ Gitlab::RepoPath.parse(project_identifier) -+ else -+ Gitlab::GlRepository.parse(project_identifier) -+ end -+ end -+ - def log(message) - Gitlab::GitLogger.error("POST-RECEIVE: #{message}") - end diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 57c274566166..65aac9891037 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -130,14 +130,6 @@ }; version = "2.0.0"; }; - allocations = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y7z66lpzabyvviphk1fnzvrj5vhv7v9vppcnkrf0n5wh8qwx2zi"; - type = "gem"; - }; - version = "1.0.5"; - }; arel = { source = { remotes = ["https://rubygems.org"]; @@ -176,10 +168,10 @@ dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0"; + sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; ast = { source = { @@ -214,22 +206,13 @@ }; version = "1.0.0"; }; - autoprefixer-rails = { - dependencies = ["execjs" "json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx"; - type = "gem"; - }; - version = "6.2.3"; - }; awesome_print = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr"; + sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; type = "gem"; }; - version = "1.2.0"; + version = "1.8.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -267,10 +250,10 @@ bcrypt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50"; + sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; type = "gem"; }; - version = "3.1.11"; + version = "3.1.12"; }; bcrypt_pbkdf = { source = { @@ -314,22 +297,14 @@ }; version = "0.7.2"; }; - blankslate = { + bootsnap = { + dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; type = "gem"; }; - version = "2.1.2.4"; - }; - bootstrap-sass = { - dependencies = ["autoprefixer-rails" "sass"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld"; - type = "gem"; - }; - version = "3.3.6"; + version = "1.3.1"; }; bootstrap_form = { source = { @@ -350,10 +325,10 @@ browser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "055r4wyc3z61r7mg2bgqpzabpkg8db2q5rciwfx9lwfyhjx19pbv"; + sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f"; type = "gem"; }; - version = "2.2.0"; + version = "2.5.3"; }; builder = { source = { @@ -411,10 +386,10 @@ dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii"; + sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; cause = { source = { @@ -436,10 +411,10 @@ dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd"; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; type = "gem"; }; - version = "0.7.0"; + version = "0.9.0"; }; chronic = { source = { @@ -477,10 +452,10 @@ coderay = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; coercible = { dependencies = ["descendants_tracker"]; @@ -491,22 +466,14 @@ }; version = "1.0.0"; }; - colorize = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16bsjcqb6pg3k94dh1l5g3hhx5g2g4g8rlr76dnc78yyzjjrbayn"; - type = "gem"; - }; - version = "0.7.7"; - }; commonmarker = { dependencies = ["ruby-enum"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i"; + sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9"; type = "gem"; }; - version = "0.17.8"; + version = "0.17.13"; }; concord = { dependencies = ["adamantium" "equalizer"]; @@ -576,15 +543,6 @@ }; version = "1.5.0"; }; - d3_rails = { - dependencies = ["railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x"; - type = "gem"; - }; - version = "3.5.11"; - }; daemons = { source = { remotes = ["https://rubygems.org"]; @@ -714,10 +672,10 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; type = "gem"; }; - version = "0.5.20170404"; + version = "0.5.20180417"; }; doorkeeper = { dependencies = ["railties"]; @@ -732,10 +690,10 @@ dependencies = ["doorkeeper" "json-jwt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck"; + sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -746,6 +704,14 @@ }; version = "0.7.2"; }; + ed25519 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; email_reply_trimmer = { source = { remotes = ["https://rubygems.org"]; @@ -755,13 +721,13 @@ version = "0.1.6"; }; email_spec = { - dependencies = ["launchy" "mail"]; + dependencies = ["htmlentities" "launchy" "mail"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv"; + sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0"; type = "gem"; }; - version = "1.6.0"; + version = "2.2.0"; }; encryptor = { source = { @@ -815,10 +781,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; type = "gem"; }; - version = "0.60.0"; + version = "0.62.0"; }; execjs = { source = { @@ -908,19 +874,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; - type = "gem"; - }; - version = "1.9.18"; - }; - flay = { - dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "2.10.0"; + version = "1.9.25"; }; flipper = { source = { @@ -988,10 +945,10 @@ dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i"; + sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; type = "gem"; }; - version = "1.3.3"; + version = "1.7.1"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1073,15 +1030,6 @@ }; version = "2.2.0"; }; - gemnasium-gitlab-service = { - dependencies = ["rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3"; - type = "gem"; - }; - version = "0.2.6"; - }; gemojione = { dependencies = ["json"]; source = { @@ -1126,22 +1074,14 @@ }; version = "1.3.0"; }; - gherkin-ruby = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1"; - type = "gem"; - }; - version = "0.3.2"; - }; gitaly-proto = { dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5sn60h71ssxmc8br32fqhgmfqxgrmdlg4vya8dyy37ai20f85z"; + sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; type = "gem"; }; - version = "0.99.0"; + version = "0.117.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1173,19 +1113,19 @@ dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a1dv8n33pj2il07c8z7gz5542iby0z2qwymv8yj1kcn4avs4dxv"; + sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; type = "gem"; }; - version = "4.2.7.2"; + version = "4.2.7.5"; }; gitlab-gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk89c2ljv9skcxzwnr84rqxv3iam30n5liv5r8hgl0l67qbg1mg"; + sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.4.1"; }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; @@ -1199,19 +1139,19 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; + sha256 = "1v6w3z7smmkqnhphb4ghgpqg61vimflqzpszybji0li99f2k1jb6"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.4"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0"; + sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1241,22 +1181,22 @@ version = "1.0.1"; }; gon = { - dependencies = ["actionpack" "json" "multi_json" "request_store"]; + dependencies = ["actionpack" "multi_json" "request_store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jmf6ly9wfrg52xkk9qb4hlfn3zdmz62ivclhp4f424m39rd9ngz"; + sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q"; + sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k"; type = "gem"; }; - version = "0.19.8"; + version = "0.23.4"; }; google-protobuf = { source = { @@ -1297,10 +1237,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v"; + sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1311,14 +1251,14 @@ }; version = "0.7.1"; }; - grape-route-helpers = { + grape-path-helpers = { dependencies = ["activesupport" "grape" "rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja4dlakk6r8p2cx113kymz9sbhdybjsiynnqpfs71lv0r6mmghj"; + sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw"; type = "gem"; }; - version = "2.1.0"; + version = "1.0.6"; }; grape_logging = { dependencies = ["grape"]; @@ -1329,6 +1269,23 @@ }; version = "1.7.0"; }; + graphiql-rails = { + dependencies = ["railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8"; + type = "gem"; + }; + version = "1.4.10"; + }; + graphql = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl"; + type = "gem"; + }; + version = "1.8.1"; + }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { @@ -1339,13 +1296,13 @@ version = "1.11.0"; }; haml = { - dependencies = ["tilt"]; + dependencies = ["temple" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; haml_lint = { dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; @@ -1360,10 +1317,18 @@ dependencies = ["temple" "thor" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ph4kv2ddr538f9ni2fmk7aq38djv5am29r3m6y64adg52n6jma9"; + sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.8"; + }; + hangouts-chat = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; + type = "gem"; + }; + version = "0.0.5"; }; hashdiff = { source = { @@ -1412,10 +1377,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.4"; }; html2text = { dependencies = ["nokogiri"]; @@ -1494,6 +1459,14 @@ }; version = "0.9.5"; }; + icalendar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; + type = "gem"; + }; + version = "2.4.1"; + }; ice_nine = { source = { remotes = ["https://rubygems.org"]; @@ -1536,6 +1509,15 @@ }; version = "1.3.2"; }; + js_regex = { + dependencies = ["regexp_parser"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + type = "gem"; + }; + version = "2.2.1"; + }; json = { source = { remotes = ["https://rubygems.org"]; @@ -1545,13 +1527,13 @@ version = "1.8.6"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78"; + sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r"; type = "gem"; }; - version = "1.9.2"; + version = "1.9.4"; }; json-schema = { dependencies = ["addressable"]; @@ -1614,7 +1596,7 @@ version = "2.10.0"; }; knapsack = { - dependencies = ["rake" "timecop"]; + dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di"; @@ -1626,10 +1608,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw"; + sha256 = "1czzdp9lfsrah2jkaddkqzmphyvnk096zm1ra6jddh626d8d53r4"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; launchy = { dependencies = ["addressable"]; @@ -1659,13 +1641,13 @@ version = "1.3.0"; }; license_finder = { - dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"]; + dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag"; + sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v"; type = "gem"; }; - version = "3.1.1"; + version = "5.4.0"; }; licensee = { dependencies = ["rugged"]; @@ -1756,10 +1738,10 @@ method_source = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; + sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -1786,6 +1768,14 @@ }; version = "0.3.0"; }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n"; + type = "gem"; + }; + version = "4.8.0"; + }; mini_mime = { source = { remotes = ["https://rubygems.org"]; @@ -1818,6 +1808,14 @@ }; version = "1.4.6"; }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + type = "gem"; + }; + version = "1.2.4"; + }; multi_json = { source = { remotes = ["https://rubygems.org"]; @@ -1878,10 +1876,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; + sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; type = "gem"; }; - version = "4.2.0"; + version = "5.0.1"; }; netrc = { source = { @@ -1895,10 +1893,19 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.4"; + }; + nokogumbo = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj"; + type = "gem"; + }; + version = "1.5.0"; }; numerizer = { source = { @@ -1929,10 +1936,10 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; + sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; type = "gem"; }; - version = "4.8.0"; + version = "4.9.0"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1953,13 +1960,13 @@ version = "2.0.0"; }; omniauth-authentiq = { - dependencies = ["omniauth-oauth2"]; + dependencies = ["jwt" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06hfga3ar8cl4glc3i2plwzhzvssfsz63sqjrvhzsjp4mz81k38c"; + sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.3"; }; omniauth-azure-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; @@ -2001,10 +2008,10 @@ dependencies = ["omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hv672p372jq7p9p6dw8i7qyisbny3lq0si077yys1fy4bjw127x"; + sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; omniauth-google-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; @@ -2073,10 +2080,10 @@ dependencies = ["omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl"; + sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -2139,21 +2146,12 @@ version = "2.5.1.0"; }; parslet = { - dependencies = ["blankslate"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; - type = "gem"; - }; - version = "1.5.0"; - }; - path_expander = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a"; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; type = "gem"; }; - version = "1.0.2"; + version = "1.8.2"; }; peek = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; @@ -2289,28 +2287,28 @@ prometheus-client-mmap = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn"; + sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.4"; }; pry = { - dependencies = ["coderay" "method_source" "slop"]; + dependencies = ["coderay" "method_source"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar"; + sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.3"; }; pry-byebug = { dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lwqc8vjq7b177xfknmigxvahp6dc8i1fy09d3n8ld1ndd909xjq"; + sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; type = "gem"; }; - version = "3.4.2"; + version = "3.4.3"; }; pry-rails = { dependencies = ["pry"]; @@ -2462,13 +2460,12 @@ version = "4.2.10"; }; rainbow = { - dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.0"; }; raindrops = { source = { @@ -2512,32 +2509,22 @@ }; version = "0.3.6"; }; - rbnacl = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48"; - type = "gem"; - }; - version = "4.0.2"; - }; - rbnacl-libsodium = { - dependencies = ["rbnacl"]; + rbtrace = { + dependencies = ["ffi" "msgpack" "trollop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qxrlig0i711zln0qzs9z37bs3wys1i6139bn7p7qxmdpnb9qgda"; + sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; type = "gem"; }; - version = "1.0.11"; + version = "0.4.10"; }; rdoc = { - dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "027dvwz1g1h4bm40v3kxqbim4p7ww4fcmxa2l1mvwiqm5cjiqd7k"; + sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; type = "gem"; }; - version = "4.2.2"; + version = "6.0.4"; }; re2 = { source = { @@ -2559,10 +2546,10 @@ recursive-open-struct = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z"; + sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.0"; }; redcarpet = { source = { @@ -2610,10 +2597,10 @@ dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25"; + sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2642,6 +2629,14 @@ }; version = "1.4.1"; }; + regexp_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + type = "gem"; + }; + version = "0.5.0"; + }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; source = { @@ -2680,10 +2675,10 @@ retriable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; rinku = { source = { @@ -2704,10 +2699,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3"; + sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2731,37 +2726,37 @@ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb"; + sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; rspec-core = { dependencies = ["rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd"; + sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a"; + sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8"; + sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; rspec-parameterized = { dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -2776,10 +2771,10 @@ dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvlmbn90k4rymlfb20ksayns5h199r9ggs67shnnanmrnh9zvyj"; + sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.2"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -2801,10 +2796,19 @@ rspec-support = { source = { remotes = ["https://rubygems.org"]; - sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb"; + sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + type = "gem"; + }; + version = "3.7.1"; + }; + rspec_junit_formatter = { + dependencies = ["builder" "rspec-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; type = "gem"; }; - version = "3.6.0"; + version = "0.2.3"; }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; @@ -2819,10 +2823,10 @@ dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf"; + sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is"; type = "gem"; }; - version = "0.52.1"; + version = "0.54.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -2837,10 +2841,10 @@ dependencies = ["rubocop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx"; + sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla"; type = "gem"; }; - version = "1.22.1"; + version = "1.22.2"; }; ruby-enum = { dependencies = ["i18n"]; @@ -2913,10 +2917,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; rufus-scheduler = { dependencies = ["et-orbi"]; @@ -2930,10 +2934,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; + sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72"; type = "gem"; }; - version = "0.27.0"; + version = "0.27.4"; }; safe_yaml = { source = { @@ -2944,13 +2948,13 @@ version = "1.0.4"; }; sanitize = { - dependencies = ["nokogiri"]; + dependencies = ["crass" "nokogiri" "nokogumbo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv"; type = "gem"; }; - version = "2.1.0"; + version = "4.6.6"; }; sass = { dependencies = ["sass-listen"]; @@ -2997,14 +3001,6 @@ }; version = "0.56.0"; }; - securecompare = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; - type = "gem"; - }; - version = "1.0.0"; - }; seed-fu = { dependencies = ["activerecord" "activesupport"]; source = { @@ -3027,10 +3023,10 @@ dependencies = ["childprocess" "rubyzip"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30"; + sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz"; type = "gem"; }; - version = "3.5.0"; + version = "3.12.0"; }; sentry-raven = { dependencies = ["faraday"]; @@ -3079,10 +3075,10 @@ dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh"; + sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; type = "gem"; }; - version = "5.0.5"; + version = "5.1.3"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3144,41 +3140,6 @@ }; version = "1.5.1"; }; - slop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - type = "gem"; - }; - version = "3.6.0"; - }; - spinach = { - dependencies = ["colorize" "gherkin-ruby" "json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688"; - type = "gem"; - }; - version = "0.8.10"; - }; - spinach-rails = { - dependencies = ["capybara" "railties" "spinach"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70"; - type = "gem"; - }; - version = "0.2.1"; - }; - spinach-rerun-reporter = { - dependencies = ["spinach"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fkmp99cpxrdzkjrxw9y9qp8qxk5d1arpmmlg5njx40rlcvx002k"; - type = "gem"; - }; - version = "0.0.2"; - }; spring = { dependencies = ["activesupport"]; source = { @@ -3197,23 +3158,14 @@ }; version = "1.0.4"; }; - spring-commands-spinach = { - dependencies = ["spring"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12qa60sclhnclwi6lskhdgr1l007bca831vhp35f06hq1zmimi2x"; - type = "gem"; - }; - version = "1.1.0"; - }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -3302,10 +3254,10 @@ temple = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6"; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; type = "gem"; }; - version = "0.7.7"; + version = "0.8.0"; }; test-prof = { source = { @@ -3360,10 +3312,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.8"; }; timecop = { source = { @@ -3385,10 +3337,10 @@ dependencies = ["parslet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; toml-rb = { dependencies = ["citrus"]; @@ -3399,6 +3351,14 @@ }; version = "1.0.0"; }; + trollop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + type = "gem"; + }; + version = "2.1.3"; + }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { @@ -3462,10 +3422,10 @@ unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -3502,14 +3462,6 @@ }; version = "0.2.7"; }; - url_safe_base64 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wgslyapmw4m6l5f6xvcvrvdz3hbkqczkhmjp96s6pzwcgxvcazz"; - type = "gem"; - }; - version = "0.2.2"; - }; validates_hostname = { dependencies = ["activerecord" "activesupport"]; source = { |