diff options
Diffstat (limited to 'www/redmine/files/patch-Gemfile')
| -rw-r--r-- | www/redmine/files/patch-Gemfile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile index 498e0c46d2b0..3b46b65b8d85 100644 --- a/www/redmine/files/patch-Gemfile +++ b/www/redmine/files/patch-Gemfile @@ -1,13 +1,13 @@ ---- Gemfile.orig 2019-04-19 20:09:58.067146000 +0900 -+++ Gemfile 2019-04-19 20:10:30.702127000 +0900 +--- Gemfile.orig 2019-06-10 12:52:16 UTC ++++ Gemfile @@ -1,25 +1,25 @@ source 'https://rubygems.org' -gem "bundler", ">= 1.5.0", "< 2.0.0" +gem "bundler", ">= 1.5.0" --gem "rails", "4.2.11" -+gem "rails", ">= 4.2.11" +-gem "rails", "4.2.11.1" ++gem "rails", ">= 4.2.11.1" gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" if RUBY_VERSION < "2.1" gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") @@ -34,7 +34,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" -@@ -32,76 +32,15 @@ +@@ -32,76 +32,15 @@ gem "rbpdf", "~> 1.19.6" # Optional gem for LDAP authentication group :ldap do @@ -113,12 +113,11 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -110,4 +49,8 @@ - # Load plugins' Gemfiles +@@ -111,3 +50,7 @@ end Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file -+end + end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) - end ++end |