refresh patches
This commit is contained in:
parent
613a939a79
commit
0531015a2b
6 changed files with 22 additions and 22 deletions
12
debian/patches/0002-loosen-devise.patch
vendored
12
debian/patches/0002-loosen-devise.patch
vendored
|
@ -4,12 +4,12 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -14,7 +14,7 @@ gem "mysql2", group: :mysql
|
||||
gem "pg", group: :postgres
|
||||
@@ -22,7 +22,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
|
||||
gem "pg", '~> 0.18.2', group: :postgres
|
||||
|
||||
# Authentication libraries
|
||||
-gem "devise", '3.2.4'
|
||||
+gem "devise", '~> 3.2'
|
||||
gem "devise-async", '0.9.0'
|
||||
-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'
|
||||
gem 'omniauth-google-oauth2', '~> 0.2.5'
|
||||
|
|
10
debian/patches/0003-loosen-doorkeeper.patch
vendored
10
debian/patches/0003-loosen-doorkeeper.patch
vendored
|
@ -2,12 +2,12 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -25,7 +25,7 @@ gem 'omniauth-kerberos', group: :kerbero
|
||||
gem 'omniauth-gitlab'
|
||||
gem 'omniauth-bitbucket'
|
||||
@@ -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.3'
|
||||
+gem 'doorkeeper', '~> 2.1'
|
||||
gem 'omniauth_crowd'
|
||||
gem "rack-oauth2", "~> 1.0.5"
|
||||
|
||||
# Two-factor authentication
|
||||
|
|
6
debian/patches/0004-loosen-rack-oauth2.patch
vendored
6
debian/patches/0004-loosen-rack-oauth2.patch
vendored
|
@ -2,12 +2,12 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -26,7 +26,7 @@ gem 'omniauth-gitlab'
|
||||
gem 'omniauth-bitbucket'
|
||||
@@ -35,7 +35,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2'
|
||||
gem 'omniauth-saml', '~> 1.4.0'
|
||||
gem 'doorkeeper', '~> 2.1'
|
||||
gem 'omniauth_crowd'
|
||||
-gem "rack-oauth2", "~> 1.0.5"
|
||||
+gem "rack-oauth2", "~> 1.0"
|
||||
|
||||
# Two-factor authentication
|
||||
gem 'devise-two-factor'
|
||||
gem 'devise-two-factor', '~> 2.0.0'
|
||||
|
|
|
@ -2,12 +2,11 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -48,7 +48,8 @@ gem 'gitlab-grack', '~> 2.0.2', require:
|
||||
@@ -52,7 +52,7 @@ gem "gitlab_git", '~> 7.2.15'
|
||||
# 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
|
||||
-gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
|
||||
+# Debian package ruby-omniauth-ldap already includes gitlab patches
|
||||
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
|
||||
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
|
||||
|
||||
# Git Wiki
|
||||
|
|
4
debian/patches/0006-loosen-grape.patch
vendored
4
debian/patches/0006-loosen-grape.patch
vendored
|
@ -4,12 +4,12 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -62,7 +62,7 @@ gem 'gollum-lib', '~> 4.0.2'
|
||||
@@ -65,7 +65,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', require: 'rack/cors'
|
||||
gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
|
||||
|
||||
|
|
7
debian/patches/loosen-rails-version.patch
vendored
7
debian/patches/loosen-rails-version.patch
vendored
|
@ -4,10 +4,11 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -1,6 +1,6 @@
|
||||
source "https://rubygems.org"
|
||||
@@ -8,7 +8,7 @@ def linux_only(require_as)
|
||||
RUBY_PLATFORM.include?('linux') && require_as
|
||||
end
|
||||
|
||||
-gem 'rails', '4.1.11'
|
||||
-gem 'rails', '4.1.12'
|
||||
+gem 'rails', '~> 4.2.4'
|
||||
|
||||
# Specify a sprockets version due to security issue
|
||||
|
|
Loading…
Reference in a new issue