refresh patches

This commit is contained in:
Praveen Arimbrathodiyil 2016-01-29 23:10:24 +05:30
parent e602990e9e
commit e588efcd23
5 changed files with 9 additions and 22 deletions

View file

@ -8,7 +8,7 @@ Index: gitlab/Gemfile
gem "pg", '~> 0.18.2', group: :postgres gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries # Authentication libraries
-gem 'devise', '~> 3.5.3' -gem 'devise', '~> 3.5.4'
+gem 'devise', '~> 3.5.2' +gem 'devise', '~> 3.5.2'
gem 'devise-async', '~> 0.9.0' gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0' gem 'doorkeeper', '~> 2.2.0'

View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -220,84 +220,6 @@ group :metrics do @@ -220,87 +220,11 @@ group :metrics do
gem 'connection_pool', '~> 2.0', require: false gem 'connection_pool', '~> 2.0', require: false
end end
@ -79,10 +79,13 @@ Index: gitlab/Gemfile
- gem 'sham_rack' - gem 'sham_rack'
-end -end
- -
-group :production do group :production do
- gem "gitlab_meta", '7.0' - gem "gitlab_meta", '7.0'
-end
- -
# Sentry integration
gem 'sentry-raven'
end
-gem "newrelic_rpm", '~> 3.9.4.245' -gem "newrelic_rpm", '~> 3.9.4.245'
-gem 'newrelic-grape' -gem 'newrelic-grape'
- -

View file

@ -4,8 +4,8 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -220,7 +220,7 @@ group :metrics do @@ -225,7 +225,7 @@ group :production do
gem 'connection_pool', '~> 2.0', require: false gem 'sentry-raven'
end end
-gem 'octokit', '~> 3.7.0' -gem 'octokit', '~> 3.7.0'

View file

@ -1,15 +0,0 @@
run from PATH
Index: gitlab/lib/support/init.d/gitlab
===================================================================
--- gitlab.orig/lib/support/init.d/gitlab
+++ gitlab/lib/support/init.d/gitlab
@@ -238,7 +238,7 @@ start_gitlab() {
else
# No need to remove a socket, gitlab-workhorse does this itself
$app_root/bin/daemon_with_pidfile $gitlab_workhorse_pid_path \
- $app_root/../gitlab-workhorse/gitlab-workhorse \
+ gitlab-workhorse \
$gitlab_workhorse_options \
>> $gitlab_workhorse_log 2>&1 &
fi

View file

@ -14,4 +14,3 @@ loosen-rails-version.patch
0107-relax-omniauth-facebook.patch 0107-relax-omniauth-facebook.patch
0108-make-mysql-optional.patch 0108-make-mysql-optional.patch
source-init-functions.patch source-init-functions.patch
0300-no-hard-coded-workhorse-path.patch