aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes namespaced routes [#3673 status:resolved]Joao Carlos2010-01-102-5/+13
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Have to remove the environment name from ARGV or IRB will freak outDavid Heinemeier Hansson2010-01-091-1/+1
|
* Add a generator_paths config optionYehuda Katz2010-01-092-5/+13
|
* Merge remote branch 'eloy/master'José Valim2010-01-0913-31/+125
|\
| * Renamed AssociationReflection #collection_association? to #collection?.Eloy Duran2010-01-085-14/+14
| |
| * Rollback the transaction when one of the autosave associations fails to ↵Eloy Duran2010-01-086-5/+78
| | | | | | | | save. [#3391 state:resolved]
| * Exclude unchanged records from the collection being considered for autosave. ↵Lawrence Pit2010-01-082-12/+7
| | | | | | | | | | | | [#2578 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * Add failing test that triggers the stack overflowBryan Stearns2010-01-084-0/+26
| |
* | Fix typo by renaming :genre to :gender.José Valim2010-01-093-8/+8
| |
* | Ensure new validates works with uniqueness validator.José Valim2010-01-084-90/+85
| |
* | Fixed that PrototypeHelper#update_page should return html_safe [DHH]David Heinemeier Hansson2010-01-082-1/+3
| |
* | Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults ↵Jeffrey Hardy2010-01-083-3/+11
|/ | | | | | | | to 'db/migrate' [#3671 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Mailer should give self as payload because it contains all the information ↵José Valim2010-01-081-1/+1
| | | | needed (as the template rendered and the mailer name).
* Allow validates to map some types to specific options. So now you can do:José Valim2010-01-084-27/+74
| | | | | | validates :email, :presence => true, :format => /@/ validates :genre, :inclusion => %w(m f) validates :password, :length => 6..20
* Compile length validator options still at the class level, so whenever the ↵José Valim2010-01-084-48/+26
| | | | validator is called, it just needs to check for :maximum, :minimum and :is values.
* Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]David Heinemeier Hansson2010-01-083-5/+29
|
* Fixed that fragment caching should return a cache hit as html_safe (or it ↵David Heinemeier Hansson2010-01-072-1/+3
| | | | would all just get escaped) [DHH]
* Return-Path per RFC needs '<' and '>' around the addr_specMikel Lindsaar2010-01-081-1/+6
|
* Liberalize picky testJeremy Kemper2010-01-071-1/+1
|
* Merge remote branch 'mikel/master'Jeremy Kemper2010-01-071-1/+1
|\
| * Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-080-0/+0
| |\ | | | | | | | | | | | | | | | Conflicts: actionmailer/actionmailer.gemspec actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
| | * Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-030-0/+0
| | |\
| | | * Silence warning of missing init on @configMikel Lindsaar2010-01-011-0/+1
| | | |
| | | * Silence @text not initialized warningMikel Lindsaar2010-01-011-1466/+1467
| | | |
| | * | Updating to Mail 1.5.0, including default values for all Message#field_name ↵Mikel Lindsaar2010-01-037-63/+64
| | | | | | | | | | | | | | | | methods, can access field objects by calling Message#[:field_name]
| | * | Silence warning of missing init on @configMikel Lindsaar2010-01-031-0/+1
| | | |
| | * | Silence @text not initialized warningMikel Lindsaar2010-01-031-1466/+1467
| | | |
| * | | Updating mail requireMikel Lindsaar2010-01-081-1/+1
| | | |
* | | | Qualify constant lookup in BasicObjectJeremy Kemper2010-01-071-1/+1
|/ / /
* | | Revert "Remove connection method definition, since it's called just once."Jeremy Kemper2010-01-071-1/+5
| | | | | | | | | | | | | | | | | | Restore the connection method which was added so it can be overridden. This reverts commit e428c75d2b67c6a7bd5f5e7e1719cdece84d497f.
* | | No more hacks to ensure generators are executed inside Rails.root.José Valim2010-01-073-19/+2
| | |
* | | Ensure application names are not singularized.José Valim2010-01-072-3/+8
| | |
* | | Run railtie and plugin initializers before app specific onesJoshua Peek2010-01-074-130/+155
| | |
* | | Ensure config/application.rb also uses app_const instead of app_name.classify.José Valim2010-01-073-3/+8
| | |
* | | Merge remote branch 'eloy/master'José Valim2010-01-076-82/+140
|\ \ \
| * | | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ↵Eloy Duran2010-01-072-4/+31
| | | | | | | | | | | | | | | | return a record. [#2415 state:resolved]
| * | | Moved the validation logic to the association reflection and refactored ↵Eloy Duran2010-01-074-33/+70
| | | | | | | | | | | | | | | | autosave_association.rb a bit.
| * | | Remove deprecated '_delete' option from NestedAttributes.Eloy Duran2010-01-072-19/+2
| | | |
| * | | Removed unnecessary call to #try and cleaned up a bit more.Eloy Duran2010-01-071-6/+4
| | | |
| * | | Don't use strings for callbacks, as these will be evaled. Rather use ↵Eloy Duran2010-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | symbols, which uses a direct method dispatch. Patch by Comron Sattari. [#3429 state:resolved]
| * | | Cleanup some code in nested_attributes.rb, autosave_association.rb, and ↵Eloy Duran2010-01-074-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | associations.rb with AssociationReflection#collection_association? Also cache the result value.
| * | | Add AssociationReflection#collection_association? which returns true if it's ↵Eloy Duran2010-01-072-1/+17
| | | | | | | | | | | | | | | | for a has_many or has_and_belongs_to_many association.
| * | | Refactored nested attributes a bit around :reject_if => :all_blank.Eloy Duran2010-01-072-6/+8
| | | |
* | | | Allow :if, :unless, :on, :allow_nil and :allow_blank as shared options in ↵José Valim2010-01-074-12/+61
| | | | | | | | | | | | | | | | validates.
* | | | Add validates method as shortcut to setup validators for a given set of ↵jamie2010-01-0717-98/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes: class Person < ActiveRecord::Base include MyValidators validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 100 } validates :email, :presence => true, :email => true end [#3058 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | Remove stray semicolon from cookie_verification_secret initialzer templateJeffrey Hardy2010-01-071-1/+1
| | | |
* | | | Align assignments in the session_store initializer templateJeffrey Hardy2010-01-071-2/+2
| | | |
* | | | Ensure that segments in default_url_options also work with format specified.José Valim2010-01-072-2/+10
| | | |
* | | | From now on, parameters defined in default_url_options can be absent from ↵José Valim2010-01-074-65/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | named routes. This allows the following setup to work: # app/controllers/application_controller.rb class ApplicationController def default_url_options(options=nil) { :locale => I18n.locale } end end # From your views and controllers: I18n.locale #=> :en users_url #=> "/en/users" users_url(:pl) #=> "/pl/users" user_url(1) #=> "/en/users/1" user_url(:pl, 1) #=> "/pl/users/1" user_url(1, :locale => :pl) #=> "/pl/users/1" If you provide all expected parameters, it still works as previously. But if any parameter is missing, it tries to assign all possible ones with the hash returned in default_url_options or the one passed straight to the named route method. Beware that default_url_options in ApplicationController is not shared with ActionMailer, so you are required to always give the locale in your email views.
* | | | Remove duplicated url_for code and move methods shared between ActionMailer ↵José Valim2010-01-0711-479/+489
| | | | | | | | | | | | | | | | and ActionController up to AbstractController.