Lines 1-13
Link Here
|
1 |
--- Gemfile.orig 2016-06-05 07:30:30 UTC |
1 |
--- Gemfile.orig 2017-07-02 13:29:06 UTC |
2 |
+++ Gemfile |
2 |
+++ Gemfile |
3 |
@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < |
3 |
@@ -4,12 +4,12 @@ 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'." |
5 |
end |
5 |
end |
6 |
|
6 |
|
7 |
-gem "rails", "4.2.5.2" |
7 |
-gem "rails", "4.2.7.1" |
8 |
-gem "jquery-rails", "~> 3.1.4" |
8 |
+gem "rails", ">= 4.2.7.1" |
9 |
+gem "rails", ">= 4.2.5.2" |
9 |
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" |
10 |
+gem "jquery-rails" |
10 |
gem "jquery-rails", "~> 3.1.4" |
11 |
gem "coderay", "~> 1.1.0" |
11 |
gem "coderay", "~> 1.1.0" |
12 |
gem "builder", ">= 3.0.4" |
12 |
gem "builder", ">= 3.0.4" |
13 |
-gem "request_store", "1.0.5" |
13 |
-gem "request_store", "1.0.5" |
Lines 15-30
Link Here
|
15 |
gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") |
15 |
gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") |
16 |
gem "protected_attributes" |
16 |
gem "protected_attributes" |
17 |
gem "actionpack-action_caching" |
17 |
gem "actionpack-action_caching" |
18 |
@@ -17,7 +17,7 @@ gem "roadie-rails" |
18 |
@@ -18,7 +18,7 @@ gem "roadie-rails", "~> 1.1.1" |
|
|
19 |
gem "roadie", "~> 3.2.1" |
19 |
gem "mimemagic" |
20 |
gem "mimemagic" |
20 |
|
21 |
|
21 |
# Request at least nokogiri 1.6.7.2 because of security advisories |
22 |
-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8") |
22 |
-gem "nokogiri", ">= 1.6.7.2" |
|
|
23 |
+gem "nokogiri" |
23 |
+gem "nokogiri" |
|
|
24 |
gem "i18n", "~> 0.7.0" |
25 |
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" |
24 |
|
26 |
|
25 |
# Request at least rails-html-sanitizer 1.0.3 because of security advisories |
27 |
@@ -31,27 +31,15 @@ gem "rbpdf", "~> 1.19.2" |
26 |
gem "rails-html-sanitizer", ">= 1.0.3" |
|
|
27 |
@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0" |
28 |
|
28 |
|
29 |
# Optional gem for LDAP authentication |
29 |
# Optional gem for LDAP authentication |
30 |
group :ldap do |
30 |
group :ldap do |
Lines 54-80
Link Here
|
54 |
platforms :jruby do |
54 |
platforms :jruby do |
55 |
# jruby-openssl is bundled with JRuby 1.7.0 |
55 |
# jruby-openssl is bundled with JRuby 1.7.0 |
56 |
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' |
56 |
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' |
57 |
@@ -67,12 +55,12 @@ if File.exist?(database_file) |
57 |
@@ -96,21 +84,6 @@ else |
58 |
adapters.each do |adapter| |
|
|
59 |
case adapter |
60 |
when 'mysql2' |
61 |
- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw] |
62 |
+ gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw] |
63 |
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby |
64 |
when 'mysql' |
65 |
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby |
66 |
when /postgresql/ |
67 |
- gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] |
68 |
+ gem "pg", ">= 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] |
69 |
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby |
70 |
when /sqlite3/ |
71 |
gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw] |
72 |
@@ -92,21 +80,6 @@ else |
73 |
warn("Please configure your config/database.yml first") |
58 |
warn("Please configure your config/database.yml first") |
74 |
end |
59 |
end |
75 |
|
60 |
|
76 |
-group :development do |
61 |
-group :development do |
77 |
- gem "rdoc", ">= 2.4.2" |
62 |
- gem "rdoc", "~> 4.3" |
78 |
- gem "yard" |
63 |
- gem "yard" |
79 |
-end |
64 |
-end |
80 |
- |
65 |
- |
Lines 85-97
Link Here
|
85 |
- gem "simplecov", "~> 0.9.1", :require => false |
70 |
- gem "simplecov", "~> 0.9.1", :require => false |
86 |
- # For running UI tests |
71 |
- # For running UI tests |
87 |
- gem "capybara" |
72 |
- gem "capybara" |
88 |
- gem "selenium-webdriver" |
73 |
- gem "selenium-webdriver", "~> 2.53.4" |
89 |
-end |
74 |
-end |
90 |
- |
75 |
- |
91 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
76 |
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
92 |
if File.exists?(local_gemfile) |
77 |
if File.exists?(local_gemfile) |
93 |
eval_gemfile local_gemfile |
78 |
eval_gemfile local_gemfile |
94 |
@@ -116,3 +89,7 @@ end |
79 |
@@ -120,3 +93,7 @@ end |
95 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
80 |
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| |
96 |
eval_gemfile file |
81 |
eval_gemfile file |
97 |
end |
82 |
end |