aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Customize subsecond digits when encoding DateWithTimeParker Selbert2014-01-263-9/+30
* adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-01-261-0/+47
* API guidelines: revises warning about +...+ [ci skip]Xavier Noria2014-01-261-1/+4
* revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ...Xavier Noria2014-01-2610-26/+12
* Merge pull request #13846 from gsaks123/patch-1Robin Dupret2014-01-261-1/+1
|\
| * Fix order syntax in find_by_sql exampleGreg Saks2014-01-261-1/+1
|/
* Maintain current timezone when changing time during DST overlapAndrew White2014-01-264-3/+30
* Remove an extra comment [ci skip]Robin Dupret2014-01-261-1/+0
* Support underscored symbols in Action Mailer configAndrew White2014-01-263-5/+37
* Don't use a class_attribute for ActionMailer::Base.preview_pathAndrew White2014-01-262-7/+3
* Add the ability to intercept emails before previewingAndrew White2014-01-264-5/+109
* Merge pull request #13844 from Alamoz/config_grammarGodfrey Chan2014-01-252-2/+2
|\
| * Correct grammar from '... allowing both thread web servers ...' to '... allow...Adrien Lamothe2014-01-252-2/+2
|/
* Merge pull request #13841 from robin850/patch-15Guillermo Iguaran2014-01-251-0/+6
|\
| * Add a missing changelog entry for #13825 [ci skip]Robin Dupret2014-01-251-0/+6
|/
* Add additional tests for #13824Andrew White2014-01-251-0/+26
* Transform dashes to underscores in resource route namesByron Bischoff2014-01-252-7/+17
* Merge pull request #13772 from chancancode/fix_has_secure_password_for_goodGodfrey Chan2014-01-244-81/+132
|\
| * Some minor fixesGodfrey Chan2014-01-242-3/+2
| * Removed old testsGodfrey Chan2014-01-243-250/+121
| * Got all the new tests passingGodfrey Chan2014-01-241-10/+8
| * Restored the ability to clear the password with user.password= nil (see the d...Godfrey Chan2014-01-241-1/+3
| * Rewrote the tests for has_secure_passwordGodfrey Chan2014-01-243-2/+183
* | Merge pull request #13835 from frodsan/remove_unused_argumentGuillermo Iguaran2014-01-241-1/+1
|\ \ | |/ |/|
| * Remove unused argument.Francesco Rodriguez2014-01-241-1/+1
|/
* Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_idsYves Senn2014-01-242-9/+26
|\
| * Fix `ActiveRecord::RecordNotFound` error message with custom primary keyKuldeep Aggarwal2014-01-252-9/+26
* | Merge pull request #13829 from qsymmachus/improve_validates_with_exampleRafael Mendonça França2014-01-241-8/+8
|\ \
| * | Reordered classes in AR Validation #validates_with example [ci skip]John Olmsted & Strand McCutchen2014-01-241-8/+8
* | | Add a test-case for GH #13825Guillermo Iguaran2014-01-241-2/+8
|/ /
* | Merge pull request #13828 from bronzle/apploader-should-check-for-fileGuillermo Iguaran2014-01-241-1/+1
|\ \
| * | app_rails_loader.rb should check if bin/rails is a File before calling File.r...Byron Bischoff2014-01-241-1/+1
|/ /
* | Merge pull request #13811 from mdesantis/issue-13810Yves Senn2014-01-243-3/+30
|\ \
| * | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; fi...Maurizio De Santis2014-01-243-3/+30
* | | Merge pull request #13821 from vipulnsward/remove-assignment-in-testYves Senn2014-01-231-1/+0
|\ \ \
| * | | Remove unused assignment to fix warnings in enum test.Vipul A M2014-01-241-1/+0
|/ / /
* | | Merge pull request #13819 from arthurnn/one_require_testGuillermo Iguaran2014-01-232-10/+8
|\ \ \
| * | | unify param.require testsArthur Neves2014-01-232-10/+8
* | | | Merge pull request #13818 from arthurnn/small_test_caseGuillermo Iguaran2014-01-231-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | test boolean and number json param parsingArthur Neves2014-01-231-0/+7
|/ / /
* | | Merge pull request #13795 from bobbus/errors-has-keyGodfrey Chan2014-01-232-2/+7
|\ \ \ | |/ / |/| |
| * | Update ActiveModel::Errors.has_key? testAdrien Coquio2014-01-221-1/+1
| * | Fix ActiveModel::Errors#has_key? return valueAdrien Coquio2014-01-221-1/+1
| * | Add failing test for ActiveModel::Errors#has_key? methodAdrien Coquio2014-01-221-0/+5
* | | Merge pull request #13799 from kbrock/better_dirtyJeremy Kemper2014-01-227-18/+49
|\ \ \ | |_|/ |/| |
| * | Move changed_attributes into dirty.rbKeenan Brock2014-01-226-16/+47
| * | put core at the beginning so other classes can modify the behaviorKeenan Brock2014-01-222-2/+2
* | | Merge pull request #13791 from kei-s/remove_duplicate_mergeCarlos Antonio da Silva2014-01-221-1/+0
|\ \ \
| * | | Remove duplicate mergekei2014-01-221-1/+0
| | |/ | |/|
* | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14