|
Lines 1-4
Link Here
|
| 1 |
--- Gemfile.orig 2018-01-08 19:38:18 UTC |
1 |
--- Gemfile.orig 2018-04-07 12:30:08 UTC |
| 2 |
+++ Gemfile |
2 |
+++ Gemfile |
| 3 |
@@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < |
3 |
@@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < |
| 4 |
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." |
4 |
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." |
|
Lines 32-45
Link Here
|
| 32 |
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" |
32 |
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" |
| 33 |
|
33 |
|
| 34 |
# Request at least rails-html-sanitizer 1.0.3 because of security advisories |
34 |
# Request at least rails-html-sanitizer 1.0.3 because of security advisories |
| 35 |
@@ -33,27 +33,15 @@ gem "rbpdf", "~> 1.19.3" |
35 |
@@ -31,29 +31,12 @@ gem "rails-html-sanitizer", ">= 1.0.3" |
|
|
36 |
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] |
| 37 |
gem "rbpdf", "~> 1.19.3" |
| 36 |
|
38 |
|
| 37 |
# Optional gem for LDAP authentication |
39 |
-# Optional gem for LDAP authentication |
| 38 |
group :ldap do |
40 |
-group :ldap do |
| 39 |
- gem "net-ldap", "~> 0.12.0" |
41 |
- gem "net-ldap", "~> 0.12.0" |
| 40 |
+ gem "net-ldap", "~> 0.12" |
42 |
-end |
| 41 |
end |
43 |
- |
| 42 |
|
|
|
| 43 |
# Optional gem for OpenID authentication |
44 |
# Optional gem for OpenID authentication |
| 44 |
group :openid do |
45 |
group :openid do |
| 45 |
- gem "ruby-openid", "~> 2.3.0", :require => "openid" |
46 |
- gem "ruby-openid", "~> 2.3.0", :require => "openid" |
|
Lines 62-68
Link Here
|
| 62 |
# Include database gems for the adapters found in the database |
63 |
# Include database gems for the adapters found in the database |
| 63 |
# configuration file |
64 |
# configuration file |
| 64 |
require 'erb' |
65 |
require 'erb' |
| 65 |
@@ -86,23 +74,6 @@ else |
66 |
@@ -86,23 +69,6 @@ else |
| 66 |
warn("Please configure your config/database.yml first") |
67 |
warn("Please configure your config/database.yml first") |
| 67 |
end |
68 |
end |
| 68 |
|
69 |
|
|
Lines 86-92
Link Here
|
| 86 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
87 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
| 87 |
if File.exists?(local_gemfile) |
88 |
if File.exists?(local_gemfile) |
| 88 |
eval_gemfile local_gemfile |
89 |
eval_gemfile local_gemfile |
| 89 |
@@ -112,3 +83,7 @@ end |
90 |
@@ -112,3 +78,7 @@ end |
| 90 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
91 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
| 91 |
eval_gemfile file |
92 |
eval_gemfile file |
| 92 |
end |
93 |
end |