refresh patches
This commit is contained in:
parent
a810882857
commit
cfeda7f743
13 changed files with 11 additions and 89 deletions
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -49,7 +49,7 @@ gem "gitlab_git", '~> 7.2.20'
|
@@ -54,7 +54,7 @@ gem "gitlab_git", '~> 7.2.22'
|
||||||
# LDAP Auth
|
# LDAP Auth
|
||||||
# GitLab fork with several improvements to original library. For full list of changes
|
# GitLab fork with several improvements to original library. For full list of changes
|
||||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||||
|
|
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.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -73,7 +73,7 @@ gem "kaminari", "~> 0.16.3"
|
@@ -74,7 +74,7 @@ gem "kaminari", "~> 0.16.3"
|
||||||
gem "haml-rails", '~> 0.9.0'
|
gem "haml-rails", '~> 0.9.0'
|
||||||
|
|
||||||
# Files attachments
|
# Files attachments
|
||||||
|
|
6
debian/patches/0016-loosen-fog.patch
vendored
6
debian/patches/0016-loosen-fog.patch
vendored
|
@ -2,12 +2,12 @@ Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -79,7 +79,7 @@ gem "carrierwave", '~> 0.10.0'
|
@@ -80,7 +80,7 @@ gem "carrierwave", '~> 0.10.0'
|
||||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||||
|
|
||||||
# for aws storage
|
# for aws storage
|
||||||
-gem "fog", "~> 1.25.0"
|
-gem "fog", "~> 1.36.0"
|
||||||
+gem "fog", "~> 1.25"
|
+gem "fog", "~> 1.34"
|
||||||
gem "unf", '~> 0.1.4'
|
gem "unf", '~> 0.1.4'
|
||||||
|
|
||||||
# Authorization
|
# Authorization
|
||||||
|
|
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.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -92,7 +92,7 @@ gem "seed-fu", '~> 2.3.5'
|
@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
|
||||||
gem 'html-pipeline', '~> 1.11.0'
|
gem 'html-pipeline', '~> 1.11.0'
|
||||||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
||||||
gem 'github-markup', '~> 1.3.1'
|
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.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -94,7 +94,7 @@ gem 'task_list', '~> 1.0.2', require
|
@@ -95,7 +95,7 @@ gem 'task_list', '~> 1.0.2', require
|
||||||
gem 'github-markup', '~> 1.3.1'
|
gem 'github-markup', '~> 1.3.1'
|
||||||
gem 'redcarpet', '~> 3.3.2'
|
gem 'redcarpet', '~> 3.3.2'
|
||||||
gem 'RedCloth', '~> 4.2.9'
|
gem 'RedCloth', '~> 4.2.9'
|
||||||
|
|
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.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -109,7 +109,7 @@ gem 'diffy', '~> 3.0.3'
|
@@ -110,7 +110,7 @@ gem 'diffy', '~> 3.0.3'
|
||||||
|
|
||||||
# Application server
|
# Application server
|
||||||
group :unicorn do
|
group :unicorn do
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
Index: gitlab/Gemfile
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/Gemfile
|
|
||||||
+++ gitlab/Gemfile
|
|
||||||
@@ -171,7 +171,7 @@ gem 'd3_rails', '~> 3.5.5'
|
|
||||||
gem "cal-heatmap-rails", "~> 0.0.1"
|
|
||||||
|
|
||||||
# underscore-rails
|
|
||||||
-gem "underscore-rails", "~> 1.4.4"
|
|
||||||
+gem "underscore-rails", "~> 1.8.2"
|
|
||||||
|
|
||||||
# Sanitize user input
|
|
||||||
gem "sanitize", '~> 2.0'
|
|
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -181,7 +181,7 @@ gem 'babosa', '~> 1.0.2'
|
@@ -182,7 +182,7 @@ gem 'babosa', '~> 1.0.2'
|
||||||
gem "rack-attack", '~> 4.3.1'
|
gem "rack-attack", '~> 4.3.1'
|
||||||
|
|
||||||
# Ace editor
|
# Ace editor
|
||||||
|
|
13
debian/patches/0029-loosen-sass-rails.patch
vendored
13
debian/patches/0029-loosen-sass-rails.patch
vendored
|
@ -1,13 +0,0 @@
|
||||||
Index: gitlab/Gemfile
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/Gemfile
|
|
||||||
+++ gitlab/Gemfile
|
|
||||||
@@ -189,7 +189,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
|
|
||||||
# Detect and convert string character encoding
|
|
||||||
gem 'charlock_holmes', '~> 0.7.3'
|
|
||||||
|
|
||||||
-gem "sass-rails", '~> 4.0.5'
|
|
||||||
+gem "sass-rails", '~> 5.0.3'
|
|
||||||
gem "coffee-rails", '~> 4.1.0'
|
|
||||||
gem "uglifier", '~> 2.7.2'
|
|
||||||
gem 'turbolinks', '~> 2.5.0'
|
|
13
debian/patches/0034-loosen-jquery-rails.patch
vendored
13
debian/patches/0034-loosen-jquery-rails.patch
vendored
|
@ -1,13 +0,0 @@
|
||||||
Index: gitlab/Gemfile
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/Gemfile
|
|
||||||
+++ gitlab/Gemfile
|
|
||||||
@@ -201,7 +201,7 @@ gem 'font-awesome-rails', '~> 4.2'
|
|
||||||
gem 'gitlab_emoji', '~> 0.2.0'
|
|
||||||
gem 'gon', '~> 6.0.1'
|
|
||||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
|
||||||
-gem 'jquery-rails', '~> 3.1.3'
|
|
||||||
+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.6.7'
|
|
35
debian/patches/0035-loosen-jquery-ui-rails.patch
vendored
35
debian/patches/0035-loosen-jquery-ui-rails.patch
vendored
|
@ -1,35 +0,0 @@
|
||||||
Index: gitlab/Gemfile
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/Gemfile
|
|
||||||
+++ gitlab/Gemfile
|
|
||||||
@@ -203,7 +203,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.6.7'
|
|
||||||
gem 'raphael-rails', '~> 2.1.2'
|
|
||||||
gem 'request_store', '~> 1.2.0'
|
|
||||||
Index: gitlab/app/assets/stylesheets/application.scss
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/app/assets/stylesheets/application.scss
|
|
||||||
+++ gitlab/app/assets/stylesheets/application.scss
|
|
||||||
@@ -2,8 +2,8 @@
|
|
||||||
* This is a manifest file that'll automatically include all the stylesheets available in this directory
|
|
||||||
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
|
||||||
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
|
||||||
- *= require jquery.ui.datepicker
|
|
||||||
- *= require jquery.ui.autocomplete
|
|
||||||
+ *= require jquery-ui/datepicker
|
|
||||||
+ *= require jquery-ui/autocomplete
|
|
||||||
*= require jquery.atwho
|
|
||||||
*= require select2
|
|
||||||
*= require_self
|
|
||||||
@@ -48,4 +48,4 @@
|
|
||||||
/*
|
|
||||||
* Styles for JS behaviors.
|
|
||||||
*/
|
|
||||||
-@import "behaviors.scss";
|
|
||||||
\ No newline at end of file
|
|
||||||
+@import "behaviors.scss";
|
|
|
@ -2,8 +2,8 @@ Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
+++ gitlab/Gemfile
|
+++ gitlab/Gemfile
|
||||||
@@ -206,7 +206,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
|
@@ -207,7 +207,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||||
gem 'jquery-ui-rails', '~> 5.0.5'
|
gem 'jquery-ui-rails', '~> 5.0.0'
|
||||||
gem 'nprogress-rails', '~> 0.1.6.7'
|
gem 'nprogress-rails', '~> 0.1.6.7'
|
||||||
gem 'raphael-rails', '~> 2.1.2'
|
gem 'raphael-rails', '~> 2.1.2'
|
||||||
-gem 'request_store', '~> 1.2.0'
|
-gem 'request_store', '~> 1.2.0'
|
||||||
|
|
4
debian/patches/series
vendored
4
debian/patches/series
vendored
|
@ -7,11 +7,7 @@ loosen-rails-version.patch
|
||||||
0017-loosen-redcarpet.patch
|
0017-loosen-redcarpet.patch
|
||||||
0018-loosen-rdoc.patch
|
0018-loosen-rdoc.patch
|
||||||
0020-loosen-unicorn.patch
|
0020-loosen-unicorn.patch
|
||||||
0027-loosen-underscore-rails.patch
|
|
||||||
0028-loosen-ace-rails-ap.patch
|
0028-loosen-ace-rails-ap.patch
|
||||||
0029-loosen-sass-rails.patch
|
|
||||||
0034-loosen-jquery-rails.patch
|
|
||||||
0035-loosen-jquery-ui-rails.patch
|
|
||||||
0037-loosen-request-store.patch
|
0037-loosen-request-store.patch
|
||||||
0100-remove-development-test.patch
|
0100-remove-development-test.patch
|
||||||
0102-loosen-octokit.patch
|
0102-loosen-octokit.patch
|
||||||
|
|
Loading…
Reference in a new issue