From c2412bd700a0481786deb1ccd2f46bc0972ae7ee Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 26 Feb 2016 07:07:08 +0100 Subject: fixup! gitlab: 8.0.5 -> 8.5.0, service improvements 8.5.0 -> 8.5.1 --- .../applications/version-management/gitlab/Gemfile | 4 +- .../version-management/gitlab/Gemfile.lock | 5 ++- .../version-management/gitlab/default.nix | 4 +- .../version-management/gitlab/gemset.nix | 50 +++++++++++++--------- .../gitlab/remove-hardcoded-locations.patch | 13 +++--- 5 files changed, 44 insertions(+), 32 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index ec40f2463945..fc7ad47919d4 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -218,7 +218,7 @@ gem 'virtus', '~> 1.0.1' gem 'net-ssh', '~> 3.0.1' # Sentry integration -gem 'sentry-raven' +gem 'sentry-raven', '~> 0.15' # Metrics group :metrics do @@ -303,6 +303,8 @@ group :production do gem "gitlab_meta", '7.0' end +gem "newrelic_rpm", '~> 3.14' + gem 'octokit', '~> 3.8.0' gem "mail_room", "~> 0.6.1" diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index ff16e6284fab..2934988f8367 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -481,6 +481,7 @@ GEM net-ldap (0.12.1) net-ssh (3.0.1) netrc (0.11.0) + newrelic_rpm (3.14.1.311) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nprogress-rails (0.1.6.7) @@ -724,7 +725,7 @@ GEM activesupport (>= 3.1, < 4.3) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (0.15.4) + sentry-raven (0.15.6) faraday (>= 0.7.6) settingslogic (2.0.9) sexp_processor (4.6.0) @@ -963,6 +964,7 @@ DEPENDENCIES nested_form (~> 0.3.2) net-ssh (~> 3.0.1) nokogiri (~> 1.6.7, >= 1.6.7.2) + newrelic_rpm (~> 3.14) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) octokit (~> 3.8.0) @@ -1010,6 +1012,7 @@ DEPENDENCIES sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) + sentry-raven (~> 0.15) sentry-raven settingslogic (~> 2.0.9) sham_rack diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 4e86768e0dd2..5f9983674308 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.5.0"; + version = "8.5.1"; buildInputs = [ ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1rhl906xnvpxkw3ngwfzi80cl3daihx5vizy04b9b39adyd3i5hl"; + sha256 = "1pn5r4axzjkgdjr59y3wgxsd2n83zfd5bry1g2w4c2qw0wcw7zqb"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 95905fb7dfc2..f63a356a1f6d 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -534,12 +534,12 @@ version = "2.0.9"; }; sentry-raven = { + version = "0.15.6"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0w2ip02zcd3krpddn54vssd7asnbj823r4mlzzqpp28q3r3mcm"; type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8"; }; - version = "0.15.4"; }; select2-rails = { dependencies = ["thor"]; @@ -612,12 +612,12 @@ version = "1.0.4"; }; rugged = { - version = "0.24.0b13"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr"; + type = "gem"; }; + version = "0.24.0b13"; }; rufus-scheduler = { source = { @@ -1324,20 +1324,20 @@ version = "0.0.6"; }; omniauth = { - version = "1.3.1"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p"; + type = "gem"; }; + version = "1.3.1"; }; octokit = { - version = "3.8.0"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8"; + type = "gem"; }; + version = "3.8.0"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1373,6 +1373,14 @@ }; version = "1.6.7.2"; }; + newrelic_rpm = { + version = "3.14.1.311"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "155aj845rxn8ikcs15gphr8svnsrki8wzps794ddbi90h0ypr319"; + }; + }; netrc = { source = { remotes = ["https://rubygems.org"]; @@ -1840,20 +1848,20 @@ version = "7.0"; }; gitlab_git = { - version = "8.2.0"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv"; + type = "gem"; }; + version = "8.2.0"; }; gitlab_emoji = { - version = "0.3.1"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj"; + type = "gem"; }; + version = "0.3.1"; }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; @@ -1882,12 +1890,12 @@ version = "1.3.3"; }; github-linguist = { - version = "4.7.5"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag"; + type = "gem"; }; + version = "4.7.5"; }; gherkin-ruby = { source = { @@ -1906,12 +1914,12 @@ version = "0.2.0"; }; gemojione = { - version = "2.2.1"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h"; + type = "gem"; }; + version = "2.2.1"; }; gemnasium-gitlab-service = { dependencies = ["rugged"]; @@ -2853,20 +2861,20 @@ version = "2.6.10"; }; allocations = { - version = "1.0.4"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc"; + type = "gem"; }; + version = "1.0.4"; }; akismet = { - version = "2.0.0"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; + type = "gem"; }; + version = "2.0.0"; }; after_commit_queue = { dependencies = ["activerecord"]; diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index d188070296ca..fbf5a05fc4e6 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -18,10 +18,10 @@ index 9095266..694a4c5 100644 config.action_mailer.raise_delivery_errors = true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 05f127d..1daef74 100644 +index 05f127d..6a4ae68 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -423,7 +422,7 @@ production: &base +@@ -423,7 +423,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -30,7 +30,6 @@ index 05f127d..1daef74 100644 # The next value is the maximum memory size grit can use # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits - diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b2114..4f4a39a 100644 --- a/lib/gitlab/logger.rb @@ -73,7 +72,7 @@ index be8fcc7..7642d74 100644 end end diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake -index 81099cb..a40b1ad 100644 +index d59872d..0b8007f 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -223,7 +223,7 @@ namespace :gitlab do @@ -95,8 +94,8 @@ index 81099cb..a40b1ad 100644 + unless File.directory?(uploads_dir) puts "no".red try_fixing_it( -- "sudo -u #{gitlab_user} mkdir -m 750 #{Rails.root}/public/uploads" -+ "sudo -u #{gitlab_user} mkdir -m 750 #{uploads_dir}" +- "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" ++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( see_installation_guide_section "GitLab" @@ -108,4 +107,4 @@ index 81099cb..a40b1ad 100644 + upload_path = File.realpath(Rails.root.join(uploads_dir)) upload_path_tmp = File.join(upload_path, 'tmp') - if File.stat(upload_path).mode == 040750 + if File.stat(upload_path).mode == 040700 -- cgit 1.4.1