##// END OF EJS Templates
Repository Identifier should be frozen (#11109)....
Repository Identifier should be frozen (#11109). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10081 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r9528:472d3a00a314
r9898:87f284dcb6c5
Show More
10-patches.rb
103 lines | 3.1 KiB | text/x-ruby | RubyLexer
Jean-Philippe Lang
Rails 2.3.5 deprecation....
r3121 require 'active_record'
Jean-Philippe Lang
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....
r2430
module ActiveRecord
class Base
include Redmine::I18n
# Translate attribute names for validation errors display
Jean-Philippe Lang
human_attribute_name accepts optional argument....
r8166 def self.human_attribute_name(attr, *args)
Jean-Baptiste Barth
Fixed: queries error messages about custom fields output a 'translation missing' error (#8554)....
r6006 l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
Jean-Philippe Lang
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....
r2430 end
end
end
module ActionView
module Helpers
module DateHelper
# distance_of_time_in_words breaks when difference is greater than 30 years
def distance_of_date_in_words(from_date, to_date = 0, options = {})
from_date = from_date.to_date if from_date.respond_to?(:to_date)
to_date = to_date.to_date if to_date.respond_to?(:to_date)
distance_in_days = (to_date - from_date).abs
I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
case distance_in_days
Jean-Philippe Lang
Fixes distance of date in words calculation....
r2902 when 0..60 then locale.t :x_days, :count => distance_in_days.round
Jean-Philippe Lang
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....
r2430 when 61..720 then locale.t :about_x_months, :count => (distance_in_days / 30).round
Jean-Philippe Lang
Fixes distance of date in words calculation....
r2902 else locale.t :over_x_years, :count => (distance_in_days / 365).floor
Jean-Philippe Lang
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....
r2430 end
end
end
end
end
Jean-Philippe Lang
Merged rails-3.2 branch....
r9346
class Resolver
def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
cached(key, [name, prefix, partial], details, locals) do
if details[:formats] & [:xml, :json]
details = details.dup
details[:formats] = details[:formats].dup + [:api]
end
find_templates(name, prefix, partial, details)
end
end
end
Jean-Philippe Lang
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....
r2430 end
Jean-Philippe Lang
Merged Rails 2.1 compatibility branch....
r1609
Jean-Philippe Lang
Fixed that some input fields are escaped on validation failures (#11027)....
r9528 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
Jean-Philippe Lang
Adds :async_smtp and :async_sendmail delivery methods to perform email deliveries asynchronously....
r2337
Jean-Philippe Lang
Port async delivery methods to Rails 3....
r9350 require 'mail'
module DeliveryMethods
class AsyncSMTP < ::Mail::SMTP
def deliver!(*args)
Thread.start do
super *args
end
end
end
class AsyncSendmail < ::Mail::Sendmail
def deliver!(*args)
Jean-Philippe Lang
Adds :async_smtp and :async_sendmail delivery methods to perform email deliveries asynchronously....
r2337 Thread.start do
Jean-Philippe Lang
Port async delivery methods to Rails 3....
r9350 super *args
Toshi MARUYAMA
remove trailing white-spaces from config/initializers/10-patches.rb....
r6572 end
Jean-Philippe Lang
Adds :async_smtp and :async_sendmail delivery methods to perform email deliveries asynchronously....
r2337 end
end
Jean-Philippe Lang
Adds a delivery method that writes emails in tmp/emails for testing purpose....
r7726
Jean-Philippe Lang
Port async delivery methods to Rails 3....
r9350 class TmpFile
def initialize(*args); end
def deliver!(mail)
dest_dir = File.join(Rails.root, 'tmp', 'emails')
Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
File.open(File.join(dest_dir, mail.message_id.gsub(/[<>]/, '') + '.eml'), 'wb') {|f| f.write(mail.encoded) }
end
Jean-Philippe Lang
Adds a delivery method that writes emails in tmp/emails for testing purpose....
r7726 end
Jean-Philippe Lang
Adds :async_smtp and :async_sendmail delivery methods to perform email deliveries asynchronously....
r2337 end
Jean-Philippe Lang
Port async delivery methods to Rails 3....
r9350 ActionMailer::Base.add_delivery_method :async_smtp, DeliveryMethods::AsyncSMTP
ActionMailer::Base.add_delivery_method :async_sendmail, DeliveryMethods::AsyncSendmail
ActionMailer::Base.add_delivery_method :tmp_file, DeliveryMethods::TmpFile
Eric Davis
Workaround for i18n 0.4.x with the old style syntax. #6428 #5608...
r4069
Jean-Philippe Lang
Dry Users API responders....
r4340 module ActionController
module MimeResponds
Jean-Philippe Lang
Merged rails-3.2 branch....
r9346 class Collector
Jean-Philippe Lang
Dry Users API responders....
r4340 def api(&block)
any(:xml, :json, &block)
end
end
end
end
Jean-Philippe Lang
Displays an explicit message when trying to start Redmine with an old session_store.rb....
r9383
module ActionController
class Base
# Displays an explicit message instead of a NoMethodError exception
# when trying to start Redmine with an old session_store.rb
# TODO: remove it in a later version
def self.session=(*args)
Jean-Philippe Lang
Fixed the path displayed in error message....
r9422 $stderr.puts "Please remove config/initializers/session_store.rb and run `rake generate_secret_token`.\n" +
Jean-Philippe Lang
Displays an explicit message when trying to start Redmine with an old session_store.rb....
r9383 "Setting the session secret with ActionController.session= is no longer supported in Rails 3."
exit 1
end
end
end