aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Clear filtered request attributes between requests in testsAndrew White2014-01-274-0/+29
* | | | | | | | | | | | docs, remove deprecation entry in favor of abe6484. [ci skip]Yves Senn2014-01-271-5/+0
* | | | | | | | | | | | Fix doc markup of clear_validators!Carlos Antonio da Silva2014-01-271-2/+2
* | | | | | | | | | | | Use the new clear_validators! api to reset validators in testsCarlos Antonio da Silva2014-01-2716-42/+33
* | | | | | | | | | | | Merge tests about multiple validation contextsCarlos Antonio da Silva2014-01-271-10/+6
* | | | | | | | | | | | mention #13314 in 4.1 release notes. refs #12140. [ci skip]Yves Senn2014-01-271-0/+3
* | | | | | | | | | | | Merge pull request #13754 from vpuzzella/masterCarlos Antonio da Silva2014-01-273-5/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Ability to specify multiple contexts when defining a validation.Vince Puzzella2014-01-273-5/+45
* | | | | | | | | | | | Merge pull request #13848 from huoxito/tell-valueCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Display value when raising due to unscope() issuesWashington Luiz2014-01-271-1/+1
* | | | | | | | | | | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes #13...Yves Senn2014-01-271-4/+12
* | | | | | | | | | | | Merge pull request #13849 from fgo/patch-12Guillermo Iguaran2014-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip]Francis Go2014-01-271-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Make ActiveSupport::TimeWithZone#xmlschema consistentAndrew White2014-01-262-2/+6
* | | | | | | | | | | Add support for JSON time_precision to Time and DateTimeAndrew White2014-01-264-7/+25
* | | | | | | | | | | Add CHANGELOG entry for #11464Andrew White2014-01-261-0/+9
* | | | | | | | | | | Rename subsecond_fraction_digits option to time_precisionAndrew White2014-01-264-8/+10
* | | | | | | | | | | Consolidate JSON encoding tests in one fileAndrew White2014-01-262-46/+48
* | | | | | | | | | | 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
|/ / / / / / / / / /