aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #13813 from lukesarnacki/log-deep-mungeRafael Mendonça França2014-01-286-4/+77
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Log for which keys values were set to nil in deep_munge
| * | | | | | | | | Log which keys were set to nil in deep_mungeLukasz Sarnacki2014-01-286-4/+77
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added.
* | | | | | | | | Merge pull request #11821 from kuroda/select-and-order-by-aliased-attributesGodfrey Chan2014-01-284-1/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Handle aliased attributes in AR::Relation#select, #order, etc.
| * | | | | | | | Handle aliased attributes in AR::Relation#select, #order, etc.Tsutomu Kuroda2014-01-294-1/+44
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this we can write `Model#select(:aliased)`, `Model#order(:aliased)`, `Model#reoder(aliased: :desc)`, etc. Supplementary work to 54122067acaad39b277a5363c6d11d6804c7bf6b.
* | | | | | | | Fix indent on test case [ci skip]Carlos Antonio da Silva2014-01-281-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #13838 from vipulnsward/13197-fix-has-one-documentationDamien Mathieu2014-01-281-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add docs about behaviour of replacing a has_one associate object.
| * | | | | | | | Add docs about behaviour of replacing a has_one associate object, that the ↵Vipul A M2014-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previous one is deleted even if the new one doesn't get persisted to database. Fixes #13197 . [ci skip]
* | | | | | | | | Merge pull request #13857 from teoljungberg/replace-file-exists-ehCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Replace File.exists? with File.exist?
| * | | | | | | | Replace File.exists? with File.exist?Teo Ljungberg2014-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To quell warnings on ruby 2.1
* | | | | | | | | Merge pull request #13855 from kuldeepaggarwal/reset_validatorsCarlos Antonio da Silva2014-01-273-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | use the new clear_validators! api everywhere to reset validators in tests
| * | | | | | | | | use the new clear_validators! api everywhere to reset validators in testsKuldeep Aggarwal2014-01-283-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #13832 from kassio/setup-for-raise-missing-translationsRafael Mendonça França2014-01-277-4/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rails config for raise on missing translations
| * | | | | | | | | Rails config for raise on missing translationsKassio Borges2014-01-277-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a config to setup whether raise exception for missing translation or not.
* | | | | | | | | | Clear filtered request attributes between requests in testsAndrew White2014-01-274-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803.
* | | | | | | | | | 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.
| * | | | | | | | | Ability to specify multiple contexts when defining a validation.Vince Puzzella2014-01-273-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: validates_presence_of :name, on: [:update, :custom_validation_context]
* | | | | | | | | | Merge pull request #13848 from huoxito/tell-valueCarlos Antonio da Silva2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Display value when raising due to unscope() issues
| * | | | | | | | | Display value when raising due to unscope() issuesWashington Luiz2014-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully make it easier to debug errors. e.g Before: RuntimeError: unscope(where: "deleted_at") failed: unscoping String is unimplemented. After: RuntimeError: unscope(where: "deleted_at") failed: unscoping String "'t'='t'" is unimplemented.
* | | | | | | | | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes ↵Yves Senn2014-01-271-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #13820.
* | | | | | | | | | Merge pull request #13849 from fgo/patch-12Guillermo Iguaran2014-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip]
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both Time#xmlschema and DateTime#xmlschema can accept nil values for the fraction_digits parameter. This commit makes this so for TimeWithZone values as well.
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subsecond fraction digits had been hardcoded to 3. This forced all timestamps to include the subsecond digits with no way to customize the value. While the subsecond format is part of the ISO8601 spec, it is not adhered to by all parsers (notably mobile clients). This adds the ability to customize the number of digits used, optionally setting them to 0 in order to eliminate the subsecond fraction entirely: ActiveSupport::JSON::Encoding.subsecond_fraction_digits = 0
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern RDoc accepts a few more things in +...+. In particular symbols work now. The current regexp in RDoc is https://github.com/rdoc/rdoc/blob/v4.1.1/lib/rdoc/markup/attribute_manager.rb#L133.
* | | | | | | | | revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ↵Xavier Noria2014-01-2610-26/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | & Xavier Noria] Closes #11247.
* | | | | | | | | Merge pull request #13846 from gsaks123/patch-1Robin Dupret2014-01-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix order syntax in find_by_sql example [ci skip]
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |