Attachment 187744 Details for Bug 223438 – this can be placed directly in to files subfolder

this can be placed directly in to files subfolder

patch-Gemfile (text/plain), 2.60 KB, created by Miroslav Lachman on 2017-11-04 22:35:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2017-11-04 22:35:50 UTC

Size: 2.60 KB

patch

obsolete

>--- Gemfile.orig	2017-07-02 13:29:06 UTC
>+++ Gemfile
>@@ -4,22 +4,22 @@ if Gem::Version.new(Bundler::VERSION) < 
>   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
> end
> 
>-gem "rails", "4.2.7.1"
>+gem "rails", ">= 4.2.7.1"
> gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
>-gem "jquery-rails", "~> 3.1.4"
>+gem "jquery-rails", "~> 4.3.0"
> gem "coderay", "~> 1.1.0"
> gem "builder", ">= 3.0.4"
>-gem "request_store", "1.0.5"
>+gem "request_store", ">= 1.0.5"
> gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
> gem "protected_attributes"
> gem "actionpack-action_caching"
> gem "actionpack-xml_parser"
>-gem "roadie-rails", "~> 1.1.1"
>+gem "roadie-rails", "~> 1.2.0"
> gem "roadie", "~> 3.2.1"
> gem "mimemagic"
> 
>-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
>-gem "i18n", "~> 0.7.0"
>+gem "nokogiri"
>+gem "i18n", "~> 0.9"
> gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
> 
> # Request at least rails-html-sanitizer 1.0.3 because of security advisories 
>@@ -31,27 +31,15 @@ gem "rbpdf", "~> 1.19.2"
> 
> # Optional gem for LDAP authentication
> group :ldap do
>-  gem "net-ldap", "~> 0.12.0"
>+  gem "net-ldap", "~> 0.12"
> end
> 
> # Optional gem for OpenID authentication
> group :openid do
>-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
>+  gem "ruby-openid", ">= 2.3.0", :require => "openid"
>   gem "rack-openid"
> end
> 
>-platforms :mri, :mingw, :x64_mingw do
>-  # Optional gem for exporting the gantt to a PNG file, not supported with jruby
>-  group :rmagick do
>-    gem "rmagick", ">= 2.14.0"
>-  end
>-
>-  # Optional Markdown support, not for JRuby
>-  group :markdown do
>-    gem "redcarpet", "~> 3.3.2"
>-  end
>-end
>-
> platforms :jruby do
>   # jruby-openssl is bundled with JRuby 1.7.0
>   gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
>@@ -96,21 +84,6 @@ else
>   warn("Please configure your config/database.yml first")
> end
> 
>-group :development do
>-  gem "rdoc", "~> 4.3"
>-  gem "yard"
>-end
>-
>-group :test do
>-  gem "minitest"
>-  gem "rails-dom-testing"
>-  gem "mocha"
>-  gem "simplecov", "~> 0.9.1", :require => false
>-  # For running UI tests
>-  gem "capybara"
>-  gem "selenium-webdriver", "~> 2.53.4"
>-end
>-
> local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
> if File.exists?(local_gemfile)
>   eval_gemfile local_gemfile
>@@ -120,3 +93,7 @@ end
> Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
>   eval_gemfile file
> end
>+
>+Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|
>+  self.instance_eval(Bundler.read_file(bundle))
>+end

Actions: View

Attachments on bug 223438: 187743 | 187744