Unverified Commit b15409d6 authored by Franz Pletz's avatar Franz Pletz
Browse files

gitlab: 8.12.8 -> 8.13.5

parent e7926400

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

+2 −2
Original line number Diff line number Diff line 
{ stdenv, ruby, bundler, fetchFromGitLab }:



stdenv.mkDerivation rec {

  version = "3.6.1";

  version = "3.6.6";

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



  srcs = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-shell";

    rev = "v${version}";

    sha256 = "0j4kwsfzb7l871fma1b1q9h33vyng2nnghn5zz192sv4yp0w2pvq";

    sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif";

  };



  buildInputs = [

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

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitLab, git, go }:



stdenv.mkDerivation rec {

  version = "0.8.2";

  version = "0.8.5";

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



  srcs = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-workhorse";

    rev = "v${version}";

    sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag";

    sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr";

  };



  buildInputs = [ git go ];

pkgs/applications/version-management/gitlab/Gemfile

+28 −33
Original line number Diff line number Diff line
@@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' 
# Responders respond_to and respond_with

gem 'responders', '~> 2.0'



# Specify a sprockets version due to increased performance

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

gem 'sprockets', '~> 3.6.0'

gem 'sprockets-es6'

gem 'sprockets', '~> 3.7.0'

gem 'sprockets-es6', '~> 0.9.2'



# Default values for AR models

gem 'default_value_for', '~> 3.0.0'
@@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql 
gem 'pg', '~> 0.18.2', group: :postgres



# Authentication libraries

gem 'devise',                 '~> 4.0'

gem 'devise',                 '~> 4.2'

gem 'doorkeeper',             '~> 4.2.0'

gem 'omniauth',               '~> 1.3.1'

gem 'omniauth-auth0',         '~> 1.4.1'
@@ -31,7 +29,7 @@ gem 'omniauth-github', '~> 1.1.1' 
gem 'omniauth-gitlab',        '~> 1.0.0'

gem 'omniauth-google-oauth2', '~> 0.4.1'

gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos

gem 'omniauth-saml',          '~> 1.6.0'

gem 'omniauth-saml',          '~> 1.7.0'

gem 'omniauth-shibboleth',    '~> 1.2.0'

gem 'omniauth-twitter',       '~> 1.2.0'

gem 'omniauth_crowd',         '~> 2.2.0'
@@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' 


# Extracting information from a git repository

# Provide access to Gitlab::Git library

gem 'gitlab_git', '~> 10.6.6'

gem 'gitlab_git', '~> 10.7.0'



# LDAP Auth

# GitLab fork with several improvements to original library. For full list of changes
@@ -102,7 +100,7 @@ gem 'seed-fu', '~> 2.3.5' 


# Markdown and HTML processing

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

gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'

gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'

gem 'gitlab-markup',      '~> 1.5.0'

gem 'redcarpet',          '~> 3.3.3'

gem 'RedCloth',           '~> 4.3.2'
@@ -112,6 +110,7 @@ gem 'creole', '~> 0.5.0' 
gem 'wikicloth',          '0.8.1'

gem 'asciidoctor',        '~> 1.5.2'

gem 'rouge',              '~> 2.0'

gem 'truncato',           '~> 0.7.8'



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

# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -122,8 +121,8 @@ gem 'diffy', '~> 3.0.3' 


# Application server

group :unicorn do

  gem 'unicorn', '~> 4.9.0'

  gem 'unicorn-worker-killer', '~> 0.4.2'

  gem 'unicorn', '~> 5.1.0'

  gem 'unicorn-worker-killer', '~> 0.4.4'

end



# State machine
@@ -132,11 +131,10 @@ gem 'state_machines-activerecord', '~> 0.4.0' 
gem 'after_commit_queue', '~> 1.3.0'



# Issue tags

gem 'acts-as-taggable-on', '~> 3.4'

gem 'acts-as-taggable-on', '~> 4.0'



# Background jobs

gem 'sinatra', '~> 1.4.4', require: false

gem 'sidekiq', '~> 4.0'

gem 'sidekiq', '~> 4.2'

gem 'sidekiq-cron', '~> 0.4.0'

gem 'redis-namespace', '~> 1.5.2'
@@ -213,7 +211,7 @@ gem 'oj', '~> 2.17.4' 
gem 'chronic', '~> 0.10.2'

gem 'chronic_duration', '~> 0.10.6'



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

gem 'sass-rails', '~> 5.0.6'

gem 'coffee-rails', '~> 4.1.0'

gem 'uglifier', '~> 2.7.2'

gem 'turbolinks', '~> 2.5.0'
@@ -227,7 +225,7 @@ gem 'gon', '~> 6.1.0' 
gem 'jquery-atwho-rails', '~> 1.3.2'

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

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

gem 'request_store',      '~> 1.3.0'

gem 'request_store',      '~> 1.3'

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

gem 'virtus',             '~> 1.0.1'

gem 'net-ssh',            '~> 3.0.1'
@@ -298,12 +296,11 @@ group :development, :test do 
  gem 'spring-commands-spinach',  '~> 1.1.0'

  gem 'spring-commands-teaspoon', '~> 0.0.2'



  gem 'rubocop', '~> 0.42.0', require: false

  gem 'rubocop', '~> 0.43.0', require: false

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

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

  gem 'haml_lint', '~> 0.18.2', require: false

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

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

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

  gem 'bundler-audit', '~> 0.5.0', require: false
@@ -311,6 +308,8 @@ group :development, :test do 


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

  gem 'knapsack', '~> 1.11.0'



  gem 'activerecord_sane_schema_dumper', '0.2'

end



group :test do
@@ -323,10 +322,6 @@ group :test do 
  gem 'timecop', '~> 0.8.0'

end



group :production do

  gem 'gitlab_meta', '7.0'

end



gem 'newrelic_rpm', '~> 3.16'



gem 'octokit', '~> 4.3.0'
@@ -335,7 +330,7 @@ gem 'mail_room', '~> 0.8.1' 


gem 'email_reply_parser', '~> 0.5.8'



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

gem 'ruby-prof', '~> 0.16.2'



## CI

gem 'activerecord-session_store', '~> 1.0.0'
@@ -348,7 +343,7 @@ gem 'oauth2', '~> 1.2.0' 
gem 'paranoia', '~> 2.0'



# Health check

gem 'health_check', '~> 2.1.0'

gem 'health_check', '~> 2.2.0'



# System information

gem 'vmstat', '~> 2.2'

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

+47 −50
Original line number Diff line number Diff line
@@ -40,14 +40,16 @@ GEM 
      multi_json (~> 1.11, >= 1.11.2)

      rack (>= 1.5.2, < 3)

      railties (>= 4.0, < 5.1)

    activerecord_sane_schema_dumper (0.2)

      rails (>= 4, < 5)

    activesupport (4.2.7.1)

      i18n (~> 0.7)

      json (~> 1.7, >= 1.7.7)

      minitest (~> 5.1)

      thread_safe (~> 0.3, >= 0.3.4)

      tzinfo (~> 1.1)

    acts-as-taggable-on (3.5.0)

      activerecord (>= 3.2, < 5)

    acts-as-taggable-on (4.0.0)

      activerecord (>= 4.0)

    addressable (2.3.8)

    after_commit_queue (1.3.0)

      activerecord (>= 3.0)
@@ -159,11 +161,15 @@ GEM 
    database_cleaner (1.5.3)

    debug_inspector (0.0.2)

    debugger-ruby_core_source (1.3.8)

    deckar01-task_list (1.0.5)

      activesupport (~> 4.0)

      html-pipeline

      rack (~> 1.0)

    default_value_for (3.0.2)

      activerecord (>= 3.2.0, < 5.1)

    descendants_tracker (0.0.4)

      thread_safe (~> 0.3, >= 0.3.1)

    devise (4.1.1)

    devise (4.2.0)

      bcrypt (~> 3.0)

      orm_adapter (~> 0.1)

      railties (>= 4.1.0, < 5.1)
@@ -211,9 +217,6 @@ GEM 
    flay (2.6.1)

      ruby_parser (~> 3.0)

      sexp_processor (~> 4.0)

    flog (4.3.2)

      ruby_parser (~> 3.1, > 3.1.0)

      sexp_processor (~> 4.4)

    flowdock (0.7.1)

      httparty (~> 0.7)

      multi_json
@@ -282,12 +285,11 @@ GEM 
      mime-types (>= 1.16, < 3)

      posix-spawn (~> 0.3)

    gitlab-markup (1.5.0)

    gitlab_git (10.6.6)

    gitlab_git (10.7.0)

      activesupport (~> 4.0)

      charlock_holmes (~> 0.7.3)

      github-linguist (~> 4.7.0)

      rugged (~> 0.24.0)

    gitlab_meta (7.0)

    gitlab_omniauth-ldap (1.2.1)

      net-ldap (~> 0.9)

      omniauth (~> 1.0)
@@ -337,7 +339,7 @@ GEM 
      thor

      tilt

    hashie (3.4.4)

    health_check (2.1.0)

    health_check (2.2.1)

      rails (>= 4.0)

    hipchat (1.5.2)

      httparty
@@ -473,9 +475,9 @@ GEM 
    omniauth-oauth2 (1.3.1)

      oauth2 (~> 1.0)

      omniauth (~> 1.2)

    omniauth-saml (1.6.0)

    omniauth-saml (1.7.0)

      omniauth (~> 1.3)

      ruby-saml (~> 1.3)

      ruby-saml (~> 1.4)

    omniauth-shibboleth (1.2.1)

      omniauth (>= 1.0.0)

    omniauth-twitter (1.2.1)
@@ -490,7 +492,7 @@ GEM 
    orm_adapter (0.5.0)

    paranoia (2.1.4)

      activerecord (~> 4.0)

    parser (2.3.1.2)

    parser (2.3.1.4)

      ast (~> 2.2)

    pg (0.18.4)

    pkg-config (1.1.7)
@@ -557,7 +559,7 @@ GEM 
      rake (>= 0.8.7)

      thor (>= 0.18.1, < 2.0)

    rainbow (2.1.0)

    raindrops (0.15.0)

    raindrops (0.17.0)

    rake (10.5.0)

    rb-fsevent (0.9.6)

    rb-inotify (0.9.5)
@@ -591,7 +593,7 @@ GEM 
    request_store (1.3.1)

    rerun (0.11.0)

      listen (~> 3.0)

    responders (2.1.1)

    responders (2.3.0)

      railties (>= 4.2.0, < 5.1)

    rinku (2.0.0)

    rotp (2.1.2)
@@ -623,7 +625,7 @@ GEM 
    rspec-retry (0.4.5)

      rspec-core

    rspec-support (3.5.0)

    rubocop (0.42.0)

    rubocop (0.43.0)

      parser (>= 2.3.1.1, < 3.0)

      powerpack (~> 0.1)

      rainbow (>= 1.99.1, < 3.0)
@@ -633,9 +635,9 @@ GEM 
      rubocop (>= 0.40.0)

    ruby-fogbugz (0.2.1)

      crack (~> 0.4)

    ruby-prof (0.15.9)

    ruby-prof (0.16.2)

    ruby-progressbar (1.8.1)

    ruby-saml (1.3.0)

    ruby-saml (1.4.1)

      nokogiri (>= 1.5.10)

    ruby_parser (3.8.2)

      sexp_processor (~> 4.1)
@@ -648,7 +650,7 @@ GEM 
    sanitize (2.1.0)

      nokogiri (>= 1.4.4)

    sass (3.4.22)

    sass-rails (5.0.5)

    sass-rails (5.0.6)

      railties (>= 4.0.0, < 6)

      sass (~> 3.1)

      sprockets (>= 2.8, < 4.0)
@@ -676,11 +678,11 @@ GEM 
      rack

    shoulda-matchers (2.8.0)

      activesupport (>= 3.0.0)

    sidekiq (4.1.4)

    sidekiq (4.2.1)

      concurrent-ruby (~> 1.0)

      connection_pool (~> 2.2, >= 2.2.0)

      rack-protection (~> 1.5)

      redis (~> 3.2, >= 3.2.1)

      sinatra (>= 1.4.7)

    sidekiq-cron (0.4.0)

      redis-namespace (>= 1.5.2)

      rufus-scheduler (>= 2.0.24)
@@ -690,10 +692,6 @@ GEM 
      json (>= 1.8, < 3)

      simplecov-html (~> 0.10.0)

    simplecov-html (0.10.0)

    sinatra (1.4.7)

      rack (~> 1.5)

      rack-protection (~> 1.4)

      tilt (>= 1.3, < 3)

    slack-notifier (1.2.1)

    slop (3.6.0)

    spinach (0.8.10)
@@ -713,10 +711,10 @@ GEM 
      spring (>= 0.9.1)

    spring-commands-teaspoon (0.0.2)

      spring (>= 0.9.1)

    sprockets (3.6.3)

    sprockets (3.7.0)

      concurrent-ruby (~> 1.0)

      rack (> 1, < 3)

    sprockets-es6 (0.9.0)

    sprockets-es6 (0.9.2)

      babel-source (>= 5.8.11)

      babel-transpiler

      sprockets (>= 3.0.0)
@@ -736,8 +734,6 @@ GEM 
      ffi

    sysexits (1.2.0)

    systemu (2.6.5)

    task_list (1.0.2)

      html-pipeline

    teaspoon (1.1.5)

      railties (>= 3.2.5, < 6)

    teaspoon-jasmine (2.2.0)
@@ -754,6 +750,9 @@ GEM 
    tilt (2.0.5)

    timecop (0.8.1)

    timfel-krb5-auth (0.8.3)

    truncato (0.7.8)

      htmlentities (~> 4.3.1)

      nokogiri (~> 1.6.1)

    turbolinks (2.5.3)

      coffee-rails

    tzinfo (1.2.2)
@@ -767,9 +766,8 @@ GEM 
      unf_ext

    unf_ext (0.0.7.2)

    unicode-display_width (1.1.1)

    unicorn (4.9.0)

    unicorn (5.1.0)

      kgio (~> 2.6)

      rack

      raindrops (~> 0.7)

    unicorn-worker-killer (0.4.4)

      get_process_mem (~> 0)
@@ -813,7 +811,8 @@ DEPENDENCIES 
  ace-rails-ap (~> 4.1.0)

  activerecord-nulldb-adapter

  activerecord-session_store (~> 1.0.0)

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

  activerecord_sane_schema_dumper (= 0.2)

  acts-as-taggable-on (~> 4.0)

  addressable (~> 2.3.8)

  after_commit_queue (~> 1.3.0)

  akismet (~> 2.0)
@@ -844,8 +843,9 @@ DEPENDENCIES 
  creole (~> 0.5.0)

  d3_rails (~> 3.5.0)

  database_cleaner (~> 1.5.0)

  deckar01-task_list (= 1.0.5)

  default_value_for (~> 3.0.0)

  devise (~> 4.0)

  devise (~> 4.2)

  devise-two-factor (~> 3.0.0)

  diffy (~> 3.0.3)

  doorkeeper (~> 4.2.0)
@@ -855,7 +855,6 @@ DEPENDENCIES 
  factory_girl_rails (~> 4.6.0)

  ffaker (~> 2.0.0)

  flay (~> 2.6.1)

  flog (~> 4.3.2)

  fog-aws (~> 0.9)

  fog-azure (~> 0.0)

  fog-core (~> 1.40)
@@ -870,9 +869,8 @@ DEPENDENCIES 
  gemojione (~> 3.0)

  github-linguist (~> 4.7.0)

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

  github-markup (~> 1.5.0)

  gitlab_git (~> 10.6.6)

  gitlab_meta (= 7.0)

  gitlab-markup (~> 1.5.0)

  gitlab_git (~> 10.7.0)

  gitlab_omniauth-ldap (~> 1.2.1)

  gollum-lib (~> 4.2)

  gollum-rugged_adapter (~> 0.4.2)
@@ -881,7 +879,7 @@ DEPENDENCIES 
  grape-entity (~> 0.4.2)

  haml_lint (~> 0.18.2)

  hamlit (~> 2.6.1)

  health_check (~> 2.1.0)

  health_check (~> 2.2.0)

  hipchat (~> 1.5.0)

  html-pipeline (~> 1.11.0)

  httparty (~> 0.13.3)
@@ -920,7 +918,7 @@ DEPENDENCIES 
  omniauth-gitlab (~> 1.0.0)

  omniauth-google-oauth2 (~> 0.4.1)

  omniauth-kerberos (~> 0.3.0)

  omniauth-saml (~> 1.6.0)

  omniauth-saml (~> 1.7.0)

  omniauth-shibboleth (~> 1.2.0)

  omniauth-twitter (~> 1.2.0)

  omniauth_crowd (~> 2.2.0)
@@ -943,19 +941,19 @@ DEPENDENCIES 
  redis (~> 3.2)

  redis-namespace (~> 1.5.2)

  redis-rails (~> 4.0.0)

  request_store (~> 1.3.0)

  request_store (~> 1.3)

  rerun (~> 0.11.0)

  responders (~> 2.0)

  rouge (~> 2.0)

  rqrcode-rails3 (~> 0.1.7)

  rspec-rails (~> 3.5.0)

  rspec-retry (~> 0.4.5)

  rubocop (~> 0.42.0)

  rubocop (~> 0.43.0)

  rubocop-rspec (~> 1.5.0)

  ruby-fogbugz (~> 0.2.1)

  ruby-prof (~> 0.15.9)

  ruby-prof (~> 0.16.2)

  sanitize (~> 2.0)

  sass-rails (~> 5.0.0)

  sass-rails (~> 5.0.6)

  scss_lint (~> 0.47.0)

  sdoc (~> 0.3.20)

  seed-fu (~> 2.3.5)
@@ -964,10 +962,9 @@ DEPENDENCIES 
  settingslogic (~> 2.0.9)

  sham_rack (~> 1.3.6)

  shoulda-matchers (~> 2.8.0)

  sidekiq (~> 4.0)

  sidekiq (~> 4.2)

  sidekiq-cron (~> 0.4.0)

  simplecov (= 0.12.0)

  sinatra (~> 1.4.4)

  slack-notifier (~> 1.2.0)

  spinach-rails (~> 0.2.1)

  spinach-rerun-reporter (~> 0.0.2)
@@ -975,23 +972,23 @@ DEPENDENCIES 
  spring-commands-rspec (~> 1.0.4)

  spring-commands-spinach (~> 1.1.0)

  spring-commands-teaspoon (~> 0.0.2)

  sprockets (~> 3.6.0)

  sprockets-es6

  sprockets (~> 3.7.0)

  sprockets-es6 (~> 0.9.2)

  state_machines-activerecord (~> 0.4.0)

  sys-filesystem (~> 1.1.6)

  task_list (~> 1.0.2)

  teaspoon (~> 1.1.0)

  teaspoon-jasmine (~> 2.2.0)

  test_after_commit (~> 0.4.2)

  thin (~> 1.7.0)

  timecop (~> 0.8.0)

  truncato (~> 0.7.8)

  turbolinks (~> 2.5.0)

  u2f (~> 0.2.1)

  uglifier (~> 2.7.2)

  underscore-rails (~> 1.8.0)

  unf (~> 0.1.4)

  unicorn (~> 4.9.0)

  unicorn-worker-killer (~> 0.4.2)

  unicorn (~> 5.1.0)

  unicorn-worker-killer (~> 0.4.4)

  version_sorter (~> 2.1.0)

  virtus (~> 1.0.1)

  vmstat (~> 2.2)
@@ -1000,4 +997,4 @@ DEPENDENCIES 
  wikicloth (= 0.8.1)



BUNDLED WITH

   1.12.5
 
   1.13.5

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ in 


stdenv.mkDerivation rec {

  name = "gitlab-${version}";

  version = "8.12.8";

  version = "8.13.5";



  buildInputs = [ env ruby bundler tzdata git nodejs procps ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 
    owner = "gitlabhq";

    repo = "gitlabhq";

    rev = "v${version}";

    sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3";

    sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3";

  };



  patches = [