Changeset View
Changeset View
Standalone View
Standalone View
www/redmine/files/patch-Gemfile
| --- Gemfile.orig 2015-02-19 13:15:56.000000000 -0600 | --- Gemfile.orig 2015-03-16 18:59:15 UTC | ||||
| +++ Gemfile 2015-03-15 12:49:50.000000000 -0500 | +++ Gemfile | ||||
| @@ -1,13 +1,13 @@ | @@ -1,24 +1,24 @@ | ||||
| source 'https://rubygems.org' | source 'https://rubygems.org' | ||||
| -gem "rails", "3.2.21" | -gem "rails", "3.2.21" | ||||
| +gem "rails", "~> 3.2" | +gem "rails", "~> 3.2" | ||||
| gem "jquery-rails", "~> 3.1.1" | gem "jquery-rails", "~> 3.1.1" | ||||
| gem "coderay", "~> 1.1.0" | gem "coderay", "~> 1.1.0" | ||||
| gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] | gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] | ||||
| gem "builder", ">= 3.0.4" | gem "builder", ">= 3.0.4" | ||||
| -gem "request_store", "1.0.5" | -gem "request_store", "1.0.5" | ||||
| +gem "request_store", "~> 1.1.0" | +gem "request_store", "~> 1.1.0" | ||||
| gem "mime-types" | gem "mime-types" | ||||
| gem "rbpdf", "~> 1.18.5" | gem "rbpdf", "~> 1.18.5" | ||||
| -gem "i18n", "~> 0.6.11" | -gem "i18n", "~> 0.6.11" | ||||
| +gem "i18n", "~> 0.7.0" | +gem "i18n", "~> 0.7.0" | ||||
| @@ -18,7 +18,7 @@ | # Optional gem for LDAP authentication | ||||
| group :ldap do | |||||
| - gem "net-ldap", "~> 0.3.1" | |||||
| + gem "net-ldap", ">= 0.3.1" | |||||
| end | |||||
| # Optional gem for OpenID authentication | # Optional gem for OpenID authentication | ||||
| group :openid do | group :openid do | ||||
| - gem "ruby-openid", "~> 2.3.0", :require => "openid" | - gem "ruby-openid", "~> 2.3.0", :require => "openid" | ||||
| + gem "ruby-openid", "~> 2.7", :require => "openid" | + gem "ruby-openid", "~> 2.7", :require => "openid" | ||||
| gem "rack-openid" | gem "rack-openid" | ||||
| end | end | ||||
| @@ -35,7 +35,7 @@ | @@ -34,7 +34,7 @@ platforms :mri, :mingw do | ||||
| # Optional Markdown support, not for JRuby | # Optional Markdown support, not for JRuby | ||||
| group :markdown do | group :markdown do | ||||
| # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped | # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped | ||||
| - gem "redcarpet", "~> 2.3.0" | - gem "redcarpet", "~> 2.3.0" | ||||
| + gem "redcarpet", "~> 3.0" | + gem "redcarpet", "~> 3.0" | ||||
| end | end | ||||
| end | end | ||||
| @@ -81,23 +81,6 @@ | @@ -81,23 +81,6 @@ else | ||||
| warn("Please configure your config/database.yml first") | warn("Please configure your config/database.yml first") | ||||
| end | end | ||||
| -group :development do | -group :development do | ||||
| - gem "rdoc", ">= 2.4.2" | - gem "rdoc", ">= 2.4.2" | ||||
| - gem "yard" | - gem "yard" | ||||
| -end | -end | ||||
| - | - | ||||
| -group :test do | -group :test do | ||||
| - gem "shoulda", "~> 3.3.2" | - gem "shoulda", "~> 3.3.2" | ||||
| - gem "shoulda-matchers", "1.4.1" | - gem "shoulda-matchers", "1.4.1" | ||||
| Show All 12 Lines | |||||