realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refresh patches at 8.1.0

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2015-10-24 20:10:10 +05:30
parent 7e5e325bc2
commit 6bdfba8d68
33 changed files with 85 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/patches/0002-loosen-devise.patch vendored
View file

@ -4,12 +4,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -22,7 +22,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
@@ -14,7 +14,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
-gem "devise", '~> 3.5.2'
+gem "devise", '~> 3.5.1'
gem "devise-async", '~> 0.9.0'
gem 'omniauth', "~> 1.2.2"
gem 'omniauth-google-oauth2', '~> 0.2.5'
-gem 'devise', '~> 3.5.2'
+gem 'devise', '~> 3.5.1'
gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.1.3'
gem 'omniauth', '~> 1.2.2'

18
debian/patches/0003-loosen-doorkeeper.patch vendored
View file

@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -33,7 +33,7 @@ gem 'omniauth-kerberos', '~> 0.2.0', gro
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-saml', '~> 1.4.0'
-gem 'doorkeeper', '~> 2.1.3'
+gem 'doorkeeper', '~> 2.1'
gem 'omniauth_crowd'
gem "rack-oauth2", "~> 1.0.5"
@@ -16,7 +16,7 @@ gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 3.5.1'
gem 'devise-async', '~> 0.9.0'
-gem 'doorkeeper', '~> 2.1.3'
+gem 'doorkeeper', '~> 2.1'
gem 'omniauth', '~> 1.2.2'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-github', '~> 1.1.1'

10
debian/patches/0004-loosen-rack-oauth2.patch vendored
View file

@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -35,7 +35,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-saml', '~> 1.4.0'
gem 'doorkeeper', '~> 2.1'
@@ -27,7 +27,7 @@ gem 'omniauth-saml', '~> 1.4.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd'
-gem "rack-oauth2", "~> 1.0.5"
+gem "rack-oauth2", "~> 1.0"
-gem 'rack-oauth2', '~> 1.0.5'
+gem 'rack-oauth2', '~> 1.0'
# Two-factor authentication
gem 'devise-two-factor', '~> 2.0.0'

2
debian/patches/0005-use-debian-omniauth-ldap.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -52,7 +52,7 @@ gem "gitlab_git", '~> 7.2.15'
@@ -44,7 +44,7 @@ gem "gitlab_git", '~> 7.2.19'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master

10
debian/patches/0006-loosen-grape.patch vendored
View file

@ -4,12 +4,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.0.2'
@@ -57,7 +57,7 @@ gem 'gollum-lib', '~> 4.0.2'
gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
# API
-gem "grape", "~> 0.6.1"
+gem "grape", "~> 0.6"
gem "grape-entity", "~> 0.4.2"
gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
-gem 'grape', '~> 0.6.1'
+gem 'grape', '~> 0.6'
gem 'grape-entity', '~> 0.4.2'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'

2
debian/patches/0012-loosen-stamp.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -71,7 +71,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
@@ -63,7 +63,7 @@ gem 'rack-cors', '~> 0.4.0', require:
# Format dates and times
# based on human-friendly examples

4
debian/patches/0013-loosen-enumerize.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -74,7 +74,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
@@ -66,7 +66,7 @@ gem 'rack-cors', '~> 0.4.0', require:
gem "stamp", '~> 0.6.0'
# Enumeration fields
@ -10,4 +10,4 @@ Index: gitlab/Gemfile
+gem 'enumerize', '~> 1.0.0'
# Pagination
gem "kaminari", "~> 0.15.1"
gem "kaminari", "~> 0.16.3"

2
debian/patches/0015-loosen-carrierwave.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -83,7 +83,7 @@ gem "kaminari", "~> 0.15.1"
@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
gem "haml-rails", '~> 0.9.0'
# Files attachments

2
debian/patches/0016-loosen-fog.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -89,7 +89,7 @@ gem "carrierwave", '~> 0.10.0'
@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage

4
debian/patches/0017-loosen-redcarpet.patch vendored
View file

@ -2,11 +2,11 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -102,7 +102,7 @@ gem "seed-fu", '~> 2.3.5'
@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.3.1'
-gem 'redcarpet', '~> 3.3.2'
-gem 'redcarpet', '~> 3.3.3'
+gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'

2
debian/patches/0018-loosen-rdoc.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -104,7 +104,7 @@ gem 'task_list', '~> 1.0.2', require
@@ -96,7 +96,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'

2
debian/patches/0019-loosen-creole.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -106,7 +106,7 @@ gem 'redcarpet', '~> 3.2.3'
@@ -98,7 +98,7 @@ gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~> 4.1'
gem 'org-ruby', '~> 0.9.12'

2
debian/patches/0020-loosen-unicorn.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -115,7 +115,7 @@ gem 'diffy', '~> 3.0.3'
@@ -107,7 +107,7 @@ gem 'diffy', '~> 3.0.3'
# Application server
group :unicorn do

4
debian/patches/0021-loosen-sidekiq.patch vendored
View file

@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -128,7 +128,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
@@ -121,7 +121,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
gem 'slim', '~> 2.0.2'
gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '3.3.0'
+gem 'sidekiq', '3.4.2'

2
debian/patches/0022-loosen-colorize.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -136,7 +136,7 @@ gem "httparty", '~> 0.13.3'
@@ -129,7 +129,7 @@ gem "httparty", '~> 0.13.3'
# Colored output to console
gem "colored", '~> 1.2'

4
debian/patches/0025-loosen-asana.patch vendored
View file

@ -2,8 +2,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -164,7 +164,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
gem "slack-notifier", "~> 1.2.1"
@@ -157,7 +157,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
gem "slack-notifier", "~> 1.2.0"
# Asana integration
-gem 'asana', '~> 0.0.6'

2
debian/patches/0026-disable-fogbugz.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -167,7 +167,7 @@ gem "slack-notifier", "~> 1.2.1"
@@ -160,7 +160,7 @@ gem "slack-notifier", "~> 1.2.0"
gem 'asana', '~> 0.1.2'
# FogBugz integration

2
debian/patches/0027-loosen-underscore-rails.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -176,7 +176,7 @@ gem 'd3_rails', '~> 3.5.5'
@@ -169,7 +169,7 @@ gem 'd3_rails', '~> 3.5.5'
gem "cal-heatmap-rails", "~> 0.0.1"
# underscore-rails

2
debian/patches/0028-loosen-ace-rails-ap.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -185,7 +185,7 @@ gem "sanitize", '~> 2.0'
@@ -178,7 +178,7 @@ gem "sanitize", '~> 2.0'
gem "rack-attack", '~> 4.3.0'
# Ace editor

4
debian/patches/0029-loosen-sass-rails.patch vendored
View file

@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -193,7 +193,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
@@ -186,7 +186,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.6.9.4'
-gem "sass-rails", '~> 4.0.5'
+gem "sass-rails", '~> 5.0.3'
gem "coffee-rails", '~> 4.1.0'
gem "uglifier", '~> 2.3.2'
gem "uglifier", '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'

4
debian/patches/0031-loosen-jquery-turbolinks.patch vendored
View file

@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -197,7 +197,7 @@ gem "sass-rails", '~> 5.0.3'
@@ -190,7 +190,7 @@ gem "sass-rails", '~> 5.0.3'
gem "coffee-rails", '~> 4.1.0'
gem "uglifier", '~> 2.3'
gem "uglifier", '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.0.1'
+gem 'jquery-turbolinks', '~> 2.1.0'

2
debian/patches/0032-loosen-gon.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -203,7 +203,7 @@ gem 'addressable', '~> 2.3.8'
@@ -196,7 +196,7 @@ gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'

2
debian/patches/0033-jquery-atwho-rails.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -204,7 +204,7 @@ gem 'bootstrap-sass', '~> 3.0'
@@ -197,7 +197,7 @@ gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 6.0.1'

2
debian/patches/0034-loosen-jquery-rails.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -205,7 +205,7 @@ gem 'font-awesome-rails', '~> 4.2'
@@ -198,7 +198,7 @@ gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'

2
debian/patches/0035-loosen-jquery-ui-rails.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -207,7 +207,7 @@ gem 'gon', '~> 6.0.1'
@@ -200,7 +200,7 @@ gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.0.4'
gem 'jquery-scrollto-rails', '~> 1.4.3'

2
debian/patches/0036-loosen-nprogress-rails.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -208,7 +208,7 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
@@ -201,7 +201,7 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.0.4'
gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.5'

14
debian/patches/0037-loosen-request-store.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -210,7 +210,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
@@ -203,7 +203,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.5'
gem 'nprogress-rails', '~> 0.1.6.7'
gem 'raphael-rails', '~> 2.1.2'
@ -11,3 +11,15 @@ Index: gitlab/Gemfile
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@@ -280,6 +280,11 @@ group :production do
gem "gitlab_meta", '7.0'
end
+
+roup :production do
+ gem "gitlab_meta", '7.0'
+end
+
gem "newrelic_rpm", '~> 3.9.4.245'
gem 'newrelic-grape'

25
debian/patches/0100-remove-development-test.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -214,70 +214,6 @@ gem 'request_store', '~> 1.1'
@@ -207,80 +207,6 @@ gem 'request_store', '~> 1.1'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@ -15,6 +15,9 @@ Index: gitlab/Gemfile
- gem 'quiet_assets', '~> 1.0.2'
- gem 'rack-mini-profiler', '~> 0.9.0', require: false
- gem 'rerun', '~> 0.10.0'
- gem 'bullet', require: false
- gem 'active_record_query_trace', require: false
- gem 'rack-lineprof', platform: :mri
-
- # Better errors handler
- gem 'better_errors', '~> 1.0.1'
@ -60,6 +63,8 @@ Index: gitlab/Gemfile
- gem 'rubocop', '~> 0.28.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false
- gem 'simplecov', '~> 0.10.0', require: false
-
- gem 'benchmark-ips', require: false
-end
-
-group :test do
@ -70,17 +75,11 @@ Index: gitlab/Gemfile
- gem 'sham_rack'
-end
-
group :production do
-group :production do
- gem "gitlab_meta", '7.0'
-end
-
-
roup :production do
gem "gitlab_meta", '7.0'
end
@@ -305,10 +241,3 @@ gem 'oauth2', '~> 1.0.0'
# Soft deletion
gem "paranoia", "~> 2.0"
-group :development, :test do
- gem 'guard-rspec', '~> 4.2.0'
-
- gem 'rb-fsevent', require: darwin_only('rb-fsevent')
- gem 'growl', require: darwin_only('growl')
- gem 'rb-inotify', require: linux_only('rb-inotify')
-end

2
debian/patches/0101-disable-newrelic.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -218,8 +218,8 @@ group :production do
@@ -211,8 +211,8 @@ roup :production do
gem "gitlab_meta", '7.0'
end

4
debian/patches/0102-loosen-octokit.patch vendored
View file

@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -221,7 +221,7 @@ end
@@ -214,7 +214,7 @@ end
#gem "newrelic_rpm", '~> 3.9.4.245'
#gem 'newrelic-grape'
-gem 'octokit', '~> 3.7.0'
+gem 'octokit', '~> 3.7'
gem "mail_room", "~> 0.5.2"
gem "mail_room", "~> 0.6.1"

2
debian/patches/0106-loosen-gollum-lib.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -55,7 +55,7 @@ gem "gitlab_git", '~> 7.2.15'
@@ -47,7 +47,7 @@ gem "gitlab_git", '~> 7.2.19'
gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki

7
debian/patches/loosen-rails-version.patch vendored
View file

@ -4,12 +4,11 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem 'rails', '4.1.12'
+gem 'rails', '~> 4.2.4'
+gem 'rails', '~> 4.2'
# Specify a sprockets version due to security issue
# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY

12
debian/patches/series vendored
View file

@ -4,14 +4,8 @@ loosen-rails-version.patch
0004-loosen-rack-oauth2.patch
0005-use-debian-omniauth-ldap.patch
0006-loosen-grape.patch
0007-loosen-omniauth-google-oauth2.patch
0008-loosen-omniauth-twitter.patch
0009-loosen-omniauth-shibboleth.patch
0010-loosen-omniauth-kerberos.patch
0011-loosen-rack-cors.patch
0012-loosen-stamp.patch
0013-loosen-enumerize.patch
0014-loosen-haml-rails.patch
0015-loosen-carrierwave.patch
0016-loosen-fog.patch
0017-loosen-redcarpet.patch
@ -20,14 +14,11 @@ loosen-rails-version.patch
0020-loosen-unicorn.patch
0021-loosen-sidekiq.patch
0022-loosen-colorize.patch
0023-loosen-tinder.patch
0024-loosen-slack-notifier.patch
0025-loosen-asana.patch
0026-disable-fogbugz.patch
0027-loosen-underscore-rails.patch
0028-loosen-ace-rails-ap.patch
0029-loosen-sass-rails.patch
0030-loosen-uglifier.patch
0031-loosen-jquery-turbolinks.patch
0032-loosen-gon.patch
0033-jquery-atwho-rails.patch
@ -38,7 +29,4 @@ loosen-rails-version.patch
0100-remove-development-test.patch
0101-disable-newrelic.patch
0102-loosen-octokit.patch
0103-loosen-whenever.patch
0104-loosen-kaminari.patch
0105-loosen-slim.patch
0106-loosen-gollum-lib.patch