|
Lines 1-9
Link Here
|
| 1 |
--- Gemfile.orig 2018-06-10 06:36:07 UTC |
1 |
--- Gemfile.orig 2019-04-19 20:09:58.067146000 +0900 |
| 2 |
+++ Gemfile |
2 |
+++ Gemfile 2019-04-19 20:10:30.702127000 +0900 |
| 3 |
@@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < |
3 |
@@ -1,25 +1,25 @@ |
| 4 |
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." |
4 |
source 'https://rubygems.org' |
| 5 |
end |
|
|
| 6 |
|
5 |
|
|
|
6 |
-gem "bundler", ">= 1.5.0", "< 2.0.0" |
| 7 |
+gem "bundler", ">= 1.5.0" |
| 8 |
|
| 7 |
-gem "rails", "4.2.11" |
9 |
-gem "rails", "4.2.11" |
| 8 |
+gem "rails", ">= 4.2.11" |
10 |
+gem "rails", ">= 4.2.11" |
| 9 |
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" |
11 |
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" |
|
Lines 32-38
Link Here
|
| 32 |
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" |
34 |
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" |
| 33 |
gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" |
35 |
gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" |
| 34 |
|
36 |
|
| 35 |
@@ -33,76 +33,15 @@ gem "rbpdf", "~> 1.19.6" |
37 |
@@ -32,76 +32,15 @@ |
| 36 |
|
38 |
|
| 37 |
# Optional gem for LDAP authentication |
39 |
# Optional gem for LDAP authentication |
| 38 |
group :ldap do |
40 |
group :ldap do |
|
Lines 111-121
Link Here
|
| 111 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
113 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
| 112 |
if File.exists?(local_gemfile) |
114 |
if File.exists?(local_gemfile) |
| 113 |
eval_gemfile local_gemfile |
115 |
eval_gemfile local_gemfile |
| 114 |
@@ -112,3 +51,7 @@ end |
116 |
@@ -110,4 +49,8 @@ |
|
|
117 |
# Load plugins' Gemfiles |
| 115 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
118 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
| 116 |
eval_gemfile file |
119 |
eval_gemfile file |
| 117 |
end |
120 |
+end |
| 118 |
+ |
121 |
+ |
| 119 |
+Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| |
122 |
+Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| |
| 120 |
+ self.instance_eval(Bundler.read_file(bundle)) |
123 |
+ self.instance_eval(Bundler.read_file(bundle)) |
| 121 |
+end |
124 |
end |