aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Maintain current timezone when changing time during DST overlapAndrew White2014-01-264-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a time is changed during DST overlap in the autumn then the method `period_for_local` will return the DST period. However if the original time is not DST then this can be surprising and is not what is generally wanted. This commit changes that behavior to maintain the current period if it's in the list of periods returned by `periods_for_local`. It is possible to alter the behavior of `period_for_local` by specifying a second argument but since we may be change from another time that could be either DST or not then this would give inconsistent results. Fixes #12163.
* | | | | Remove an extra comment [ci skip]Robin Dupret2014-01-261-1/+0
| | | | |
* | | | | Support underscored symbols in Action Mailer configAndrew White2014-01-263-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow the use of underscored symbols to represent classes throughout other parts of Rails so it seems incongruous that it's not supported in `register_interceptor` and `register_observer`.
* | | | | Don't use a class_attribute for ActionMailer::Base.preview_pathAndrew White2014-01-262-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Since preview_path is read from ActionMailer::Base when previewing, subclasses can’t change it so don’t there's no need for the extra overhead imposed by using it.
* | | | | Add the ability to intercept emails before previewingAndrew White2014-01-264-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support the ability for tools like CSS style inliners to operate on emails being previewed this commit adds a hook in a similar fashion to the existing delivery interceptor hook, e.g: class CSSInlineStyler def self.previewing_email(message) # inline CSS styles end end ActionMailer::Base.register_preview_interceptor CSSInlineStyler Fixes #13622.
* | | | | Merge pull request #13844 from Alamoz/config_grammarGodfrey Chan2014-01-252-2/+2
|\ \ \ \ \ | | | | | | | | | | | | thread -> threaded [ci skip]
| * | | | | Correct grammar from '... allowing both thread web servers ...' to '... ↵Adrien Lamothe2014-01-252-2/+2
|/ / / / / | | | | | | | | | | | | | | | allowing both threaded web servers ...'.
* | | | | Merge pull request #13841 from robin850/patch-15Guillermo Iguaran2014-01-251-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Add a missing changelog entry for #13825 [ci skip]
| * | | | 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
| | | | | | | | | | | | | | | | Fixes #13824
* | | | Merge pull request #13772 from chancancode/fix_has_secure_password_for_goodGodfrey Chan2014-01-244-81/+132
|\ \ \ \ | | | | | | | | | | Refactored validations rules for has_secure_password
| * | | | 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 ↵Godfrey Chan2014-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | docs)
| * | | | 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.
| * | | | 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 key
| * | | | 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]
| * | | | | Reordered classes in AR Validation #validates_with example [ci skip]John Olmsted & Strand McCutchen2014-01-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Person called GoodnessValidator before it was defined. This change will compile the example correctly.
* | | | | | 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 F...
| * | | | | app_rails_loader.rb should check if bin/rails is a File before calling ↵Byron Bischoff2014-01-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | File.read(exe); closes #13825
* | | | | Merge pull request #13811 from mdesantis/issue-13810Yves Senn2014-01-243-3/+30
|\ \ \ \ \ | | | | | | | | | | | | Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes
| * | | | | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵Maurizio De Santis2014-01-243-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes rails/rails#13810 Squash
* | | | | | Merge pull request #13821 from vipulnsward/remove-assignment-in-testYves Senn2014-01-231-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused assignment to fix warnings in enum test.
| * | | | | | 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 tests
| * | | | | | 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 parsing
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix ActiveModel::Errors#has_key? returning nil
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | From the doc, this method should return false and not nil if there is no errors for this key
* | | | | | Merge pull request #13799 from kbrock/better_dirtyJeremy Kemper2014-01-227-18/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Better ActiveRecord hierarchy for Dirty and others
| * | | | | Move changed_attributes into dirty.rbKeenan Brock2014-01-226-16/+47
| | | | | | | | | | | | | | | | | | Move serialization dirty into serialization.rb
| * | | | | 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 merge
| * | | | | | Remove duplicate mergekei2014-01-221-1/+0
| | |/ / / / | |/| | | |
* | | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14
| | | | | |
* | | | | | Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
| | | | | |
* | | | | | Merge pull request #13790 from kschlarman/collection_association_reset_fixRafael Mendonça França2014-01-223-0/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Calling reset on a collection association should unload the assocation
| * | | | | Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-213-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | Need to define #reset on CollectionProxy.
* | | | | | Merge pull request #13728 from semenyukdmitriy/masterYves Senn2014-01-222-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added missing `file` delivery method to the Configuration Guide
| * | | | | [ci skip] Added missing `file` delivery methodSemenyuk Dmitriy2014-01-222-2/+2
| | | | | |
* | | | | | Merge pull request #13786 from terracatta/masterRafael Mendonça França2014-01-219-85/+168
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure AR #second, #third, etc. finders work through associations
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:00:20 +0000