refresh patches for 8.1.0->8.2.1
This commit is contained in:
parent
eed9e7149c
commit
eadcbccc20
31 changed files with 44 additions and 151 deletions
2
debian/patches/0003-loosen-doorkeeper.patch
vendored
2
debian/patches/0003-loosen-doorkeeper.patch
vendored
|
@ -10,4 +10,4 @@ Index: gitlab/Gemfile
|
|||
+gem 'doorkeeper', '~> 2.1'
|
||||
gem 'omniauth', '~> 1.2.2'
|
||||
gem 'omniauth-bitbucket', '~> 0.0.2'
|
||||
gem 'omniauth-github', '~> 1.1.1'
|
||||
gem 'omniauth-facebook', '~> 3.0.0'
|
||||
|
|
2
debian/patches/0004-loosen-rack-oauth2.patch
vendored
2
debian/patches/0004-loosen-rack-oauth2.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -27,7 +27,7 @@ gem 'omniauth-saml', '~> 1.4.0'
|
||||
@@ -28,7 +28,7 @@ gem 'omniauth-saml', '~> 1.4.0'
|
||||
gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||
gem 'omniauth-twitter', '~> 1.2.0'
|
||||
gem 'omniauth_crowd'
|
||||
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -44,7 +44,7 @@ gem "gitlab_git", '~> 7.2.19'
|
||||
@@ -45,7 +45,7 @@ gem "gitlab_git", '~> 7.2.20'
|
||||
# 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
|
||||
|
|
15
debian/patches/0006-loosen-grape.patch
vendored
15
debian/patches/0006-loosen-grape.patch
vendored
|
@ -1,15 +0,0 @@
|
|||
Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2761
|
||||
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -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.4.0', require: 'rack/cors'
|
||||
|
13
debian/patches/0012-loosen-stamp.patch
vendored
13
debian/patches/0012-loosen-stamp.patch
vendored
|
@ -1,13 +0,0 @@
|
|||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -63,7 +63,7 @@ gem 'rack-cors', '~> 0.4.0', require:
|
||||
|
||||
# Format dates and times
|
||||
# based on human-friendly examples
|
||||
-gem "stamp", '~> 0.5.0'
|
||||
+gem "stamp", '~> 0.6.0'
|
||||
|
||||
# Enumeration fields
|
||||
gem 'enumerize', '~> 0.7.0'
|
2
debian/patches/0013-loosen-enumerize.patch
vendored
2
debian/patches/0013-loosen-enumerize.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -66,7 +66,7 @@ gem 'rack-cors', '~> 0.4.0', require:
|
||||
@@ -63,7 +63,7 @@ gem 'rack-cors', '~> 0.4.0', require:
|
||||
gem "stamp", '~> 0.6.0'
|
||||
|
||||
# Enumeration fields
|
||||
|
|
2
debian/patches/0015-loosen-carrierwave.patch
vendored
2
debian/patches/0015-loosen-carrierwave.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
|
||||
@@ -72,7 +72,7 @@ gem "kaminari", "~> 0.16.3"
|
||||
gem "haml-rails", '~> 0.9.0'
|
||||
|
||||
# Files attachments
|
||||
|
|
2
debian/patches/0016-loosen-fog.patch
vendored
2
debian/patches/0016-loosen-fog.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
|
||||
@@ -78,7 +78,7 @@ gem "carrierwave", '~> 0.10.0'
|
||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||
|
||||
# for aws storage
|
||||
|
|
2
debian/patches/0017-loosen-redcarpet.patch
vendored
2
debian/patches/0017-loosen-redcarpet.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
|
||||
@@ -91,7 +91,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'
|
||||
|
|
2
debian/patches/0018-loosen-rdoc.patch
vendored
2
debian/patches/0018-loosen-rdoc.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -96,7 +96,7 @@ gem 'task_list', '~> 1.0.2', require
|
||||
@@ -93,7 +93,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
2
debian/patches/0019-loosen-creole.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -98,7 +98,7 @@ gem 'redcarpet', '~> 3.2.3'
|
||||
@@ -95,7 +95,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
2
debian/patches/0020-loosen-unicorn.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -107,7 +107,7 @@ gem 'diffy', '~> 3.0.3'
|
||||
@@ -104,7 +104,7 @@ gem 'diffy', '~> 3.0.3'
|
||||
|
||||
# Application server
|
||||
group :unicorn do
|
||||
|
|
2
debian/patches/0021-loosen-sidekiq.patch
vendored
2
debian/patches/0021-loosen-sidekiq.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -121,7 +121,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
|
||||
@@ -118,7 +118,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
|
||||
|
||||
# Background jobs
|
||||
gem 'sinatra', '~> 1.4.4', require: nil
|
||||
|
|
2
debian/patches/0022-loosen-colorize.patch
vendored
2
debian/patches/0022-loosen-colorize.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -129,7 +129,7 @@ gem "httparty", '~> 0.13.3'
|
||||
@@ -126,7 +126,7 @@ gem "httparty", '~> 0.13.3'
|
||||
|
||||
# Colored output to console
|
||||
gem "colored", '~> 1.2'
|
||||
|
|
2
debian/patches/0025-loosen-asana.patch
vendored
2
debian/patches/0025-loosen-asana.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -157,7 +157,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
|
||||
@@ -154,7 +154,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
|
||||
gem "slack-notifier", "~> 1.2.0"
|
||||
|
||||
# Asana integration
|
||||
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -169,7 +169,7 @@ gem 'd3_rails', '~> 3.5.5'
|
||||
@@ -166,7 +166,7 @@ gem 'd3_rails', '~> 3.5.5'
|
||||
gem "cal-heatmap-rails", "~> 0.0.1"
|
||||
|
||||
# underscore-rails
|
||||
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -178,7 +178,7 @@ gem "sanitize", '~> 2.0'
|
||||
@@ -175,7 +175,7 @@ gem "sanitize", '~> 2.0'
|
||||
gem "rack-attack", '~> 4.3.0'
|
||||
|
||||
# Ace editor
|
||||
|
|
4
debian/patches/0029-loosen-sass-rails.patch
vendored
4
debian/patches/0029-loosen-sass-rails.patch
vendored
|
@ -2,9 +2,9 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -186,7 +186,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
|
||||
@@ -183,7 +183,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.6.9.4'
|
||||
gem 'charlock_holmes', '~> 0.7.3'
|
||||
|
||||
-gem "sass-rails", '~> 4.0.5'
|
||||
+gem "sass-rails", '~> 5.0.3'
|
||||
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -190,7 +190,7 @@ gem "sass-rails", '~> 5.0.3'
|
||||
@@ -187,7 +187,7 @@ gem "sass-rails", '~> 5.0.3'
|
||||
gem "coffee-rails", '~> 4.1.0'
|
||||
gem "uglifier", '~> 2.7.2'
|
||||
gem 'turbolinks', '~> 2.5.0'
|
||||
|
|
4
debian/patches/0032-loosen-gon.patch
vendored
4
debian/patches/0032-loosen-gon.patch
vendored
|
@ -2,12 +2,12 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -196,7 +196,7 @@ gem 'addressable', '~> 2.3.8'
|
||||
@@ -193,7 +193,7 @@ gem 'addressable', '~> 2.3.8'
|
||||
gem 'bootstrap-sass', '~> 3.0'
|
||||
gem 'font-awesome-rails', '~> 4.2'
|
||||
gem 'gitlab_emoji', '~> 0.1'
|
||||
-gem 'gon', '~> 5.0.0'
|
||||
+gem 'gon', '~> 6.0.1'
|
||||
gem 'jquery-atwho-rails', '~> 1.0.0'
|
||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
gem 'jquery-rails', '~> 3.1.3'
|
||||
gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
|
|
13
debian/patches/0033-jquery-atwho-rails.patch
vendored
13
debian/patches/0033-jquery-atwho-rails.patch
vendored
|
@ -1,13 +0,0 @@
|
|||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -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'
|
||||
-gem 'jquery-atwho-rails', '~> 1.0.0'
|
||||
+gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
gem 'jquery-rails', '~> 3.1.3'
|
||||
gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
gem 'jquery-ui-rails', '~> 4.2.1'
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -198,7 +198,7 @@ gem 'font-awesome-rails', '~> 4.2'
|
||||
@@ -195,7 +195,7 @@ gem 'font-awesome-rails', '~> 4.2'
|
||||
gem 'gitlab_emoji', '~> 0.1'
|
||||
gem 'gon', '~> 6.0.1'
|
||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
|
@ -10,4 +10,4 @@ Index: gitlab/Gemfile
|
|||
+gem 'jquery-rails', '~> 4.0.4'
|
||||
gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
gem 'jquery-ui-rails', '~> 4.2.1'
|
||||
gem 'nprogress-rails', '~> 0.1.2.3'
|
||||
gem 'nprogress-rails', '~> 0.1.6.7'
|
||||
|
|
|
@ -2,13 +2,13 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -200,7 +200,7 @@ gem 'gon', '~> 6.0.1'
|
||||
@@ -197,7 +197,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'
|
||||
-gem 'jquery-ui-rails', '~> 4.2.1'
|
||||
+gem 'jquery-ui-rails', '~> 5.0.5'
|
||||
gem 'nprogress-rails', '~> 0.1.2.3'
|
||||
gem 'nprogress-rails', '~> 0.1.6.7'
|
||||
gem 'raphael-rails', '~> 2.1.2'
|
||||
gem 'request_store', '~> 1.2.0'
|
||||
Index: gitlab/app/assets/stylesheets/application.scss
|
||||
|
|
13
debian/patches/0036-loosen-nprogress-rails.patch
vendored
13
debian/patches/0036-loosen-nprogress-rails.patch
vendored
|
@ -1,13 +0,0 @@
|
|||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -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'
|
||||
-gem 'nprogress-rails', '~> 0.1.2.3'
|
||||
+gem 'nprogress-rails', '~> 0.1.6.7'
|
||||
gem 'raphael-rails', '~> 2.1.2'
|
||||
gem 'request_store', '~> 1.2.0'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -203,7 +203,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
@@ -200,7 +200,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,7 +11,7 @@ Index: gitlab/Gemfile
|
|||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
|
||||
@@ -280,6 +280,11 @@ group :production do
|
||||
@@ -277,6 +277,11 @@ group :production do
|
||||
gem "gitlab_meta", '7.0'
|
||||
end
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -207,84 +207,10 @@ gem 'request_store', '~> 1.1'
|
||||
@@ -204,87 +204,6 @@ gem 'request_store', '~> 1.1'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
|
||||
|
@ -13,11 +13,9 @@ Index: gitlab/Gemfile
|
|||
- gem "annotate", "~> 2.6.0"
|
||||
- gem "letter_opener", '~> 1.1.2'
|
||||
- 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
|
||||
- gem 'rblineprof', platform: :mri, require: false
|
||||
-
|
||||
- # Better errors handler
|
||||
- gem 'better_errors', '~> 1.0.1'
|
||||
|
@ -63,6 +61,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 'flog', require: false
|
||||
- gem 'flay', require: false
|
||||
-
|
||||
- gem 'benchmark-ips', require: false
|
||||
-end
|
||||
|
@ -75,15 +75,18 @@ Index: gitlab/Gemfile
|
|||
- gem 'sham_rack'
|
||||
-end
|
||||
-
|
||||
group :production do
|
||||
gem "gitlab_meta", '7.0'
|
||||
end
|
||||
|
||||
-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'
|
||||
-gem "newrelic_rpm", '~> 3.9.4.245'
|
||||
-gem 'newrelic-grape'
|
||||
-
|
||||
gem 'octokit', '~> 3.7.0'
|
||||
|
||||
gem "mail_room", "~> 0.6.1"
|
||||
|
|
15
debian/patches/0101-disable-newrelic.patch
vendored
15
debian/patches/0101-disable-newrelic.patch
vendored
|
@ -1,15 +0,0 @@
|
|||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -211,8 +211,8 @@ roup :production do
|
||||
gem "gitlab_meta", '7.0'
|
||||
end
|
||||
|
||||
-gem "newrelic_rpm", '~> 3.9.4.245'
|
||||
-gem 'newrelic-grape'
|
||||
+#gem "newrelic_rpm", '~> 3.9.4.245'
|
||||
+#gem 'newrelic-grape'
|
||||
|
||||
gem 'octokit', '~> 3.7.0'
|
||||
|
6
debian/patches/0102-loosen-octokit.patch
vendored
6
debian/patches/0102-loosen-octokit.patch
vendored
|
@ -2,9 +2,9 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -214,7 +214,7 @@ end
|
||||
#gem "newrelic_rpm", '~> 3.9.4.245'
|
||||
#gem 'newrelic-grape'
|
||||
@@ -204,7 +204,7 @@ gem 'request_store', '~> 1.1'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
|
||||
-gem 'octokit', '~> 3.7.0'
|
||||
+gem 'octokit', '~> 3.7'
|
||||
|
|
4
debian/patches/0106-loosen-gollum-lib.patch
vendored
4
debian/patches/0106-loosen-gollum-lib.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -47,7 +47,7 @@ gem "gitlab_git", '~> 7.2.19'
|
||||
@@ -48,7 +48,7 @@ gem "gitlab_git", '~> 7.2.20'
|
||||
gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
|
||||
|
||||
# Git Wiki
|
||||
|
@ -10,4 +10,4 @@ Index: gitlab/Gemfile
|
|||
+gem 'gollum-lib', '~> 4.1.0'
|
||||
|
||||
# Language detection
|
||||
# GitLab fork of linguist does not require pygments/python dependency.
|
||||
gem "github-linguist", "~> 4.7.0", require: "linguist"
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
From 2e5d32e07a75b98e57a0476a4cdb7a1ec41cadda Mon Sep 17 00:00:00 2001
|
||||
From: Pirate Praveen <praveen@debian.org>
|
||||
Date: Sun, 8 Nov 2015 12:15:58 -0500
|
||||
Subject: [PATCH] Switch to state_machines-activerecord (Fixes: #3374)
|
||||
|
||||
---
|
||||
Gemfile | 2 +-
|
||||
config/initializers/state_machine_patch.rb | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -112,7 +112,7 @@ group :unicorn do
|
||||
end
|
||||
|
||||
# State machine
|
||||
-gem "state_machine", '~> 1.2.0'
|
||||
+gem "state_machines-activerecord", '~> 0.3.0'
|
||||
# Run events after state machine commits
|
||||
gem 'after_commit_queue'
|
||||
|
||||
Index: gitlab/config/initializers/state_machine_patch.rb
|
||||
===================================================================
|
||||
--- gitlab.orig/config/initializers/state_machine_patch.rb
|
||||
+++ gitlab/config/initializers/state_machine_patch.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
# This is a patch to address the issue in https://github.com/pluginaweek/state_machine/issues/251
|
||||
# where gem 'state_machine' was not working for Rails 4.1
|
||||
-module StateMachine
|
||||
+module StateMachines
|
||||
module Integrations
|
||||
module ActiveModel
|
||||
public :around_validation
|
6
debian/patches/series
vendored
6
debian/patches/series
vendored
|
@ -3,8 +3,6 @@ loosen-rails-version.patch
|
|||
0003-loosen-doorkeeper.patch
|
||||
0004-loosen-rack-oauth2.patch
|
||||
0005-use-debian-omniauth-ldap.patch
|
||||
0006-loosen-grape.patch
|
||||
0012-loosen-stamp.patch
|
||||
0013-loosen-enumerize.patch
|
||||
0015-loosen-carrierwave.patch
|
||||
0016-loosen-fog.patch
|
||||
|
@ -20,13 +18,9 @@ loosen-rails-version.patch
|
|||
0029-loosen-sass-rails.patch
|
||||
0031-loosen-jquery-turbolinks.patch
|
||||
0032-loosen-gon.patch
|
||||
0033-jquery-atwho-rails.patch
|
||||
0034-loosen-jquery-rails.patch
|
||||
0035-loosen-jquery-ui-rails.patch
|
||||
0036-loosen-nprogress-rails.patch
|
||||
0037-loosen-request-store.patch
|
||||
0100-remove-development-test.patch
|
||||
0101-disable-newrelic.patch
|
||||
0102-loosen-octokit.patch
|
||||
0106-loosen-gollum-lib.patch
|
||||
0200-switch-to-state-machine.patch
|
||||
|
|
Loading…
Reference in a new issue