aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fixing issue with activerecord serialization not being able to dump a record ↵Mauricio Linhares2014-01-295-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after loading it from YAML - fixes #13861
* | | | | | | | | Merge pull request #13876 from sowjumn/masterRafael Mendonça França2014-01-291-10/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Added some style changes in asset pipeline documentation
| * | | | | | | | Added some style changes in asset pipeline documentationsowjanya2014-01-291-10/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #13871 from kassio/fix-filters-with-classes-documentationRobin Dupret2014-01-293-2/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix documentation of filters api with classes [ci skip]
| * | | | | | | | Fix documentation of new controller filters api [ci skip]Kassio Borges2014-01-293-2/+12
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The api for filters with classes change and the guides weren't updated. Now the class must respond for methods with the same name as the filter, so the `before_action` calls a `before` method, and so on. The method `#filter` has been deprecated in 4.0.0 and has been removed in 4.1.0: #7560
* | | | | | | | Merge pull request #13201 from marcandre/find_in_batch_enumeratorRafael Mendonça França2014-01-293-0/+27
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_in_batches` now returns an `Enumerator` Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/batches.rb
| * | | | | | | `find_in_batches` now returns an `Enumerator` when called without a block, ↵Marc-Andre Lafortune2013-12-063-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that it can be chained with other `Enumerable` methods.
* | | | | | | | Merge pull request #13877 from marcandre/find_in_batchesRafael Mendonça França2014-01-291-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mention find_each in find_in_batches doc [ci skip]
| * | | | | | | | Mention find_each in find_in_batches doc [ci skip]Marc-Andre Lafortune2014-01-291-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #13450 from chancancode/ar_raise_on_conflictGodfrey Chan2014-01-298-9/+219
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise an error if `scope` or `enum` is about to add a conflicting method to the class Fixed #13389
| * | | | | | | | `enum` now raises on "dangerous" name conflictsGodfrey Chan2014-01-293-3/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dangerous name conflicts includes instance or class method conflicts with methods defined within `ActiveRecord::Base` but not its ancestors, as well as conflicts with methods generated by other enums on the same class. Fixes #13389.
| * | | | | | | | `scope` now raises on "dangerous" name conflictsGodfrey Chan2014-01-294-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to dangerous attribute methods, a scope name conflict is dangerous if it conflicts with an existing class method defined within `ActiveRecord::Base` but not its ancestors. See also #13389. *Godfrey Chan*, *Philippe Creux*
| * | | | | | | | Fixed a bug in AR::Base#respond_to?Godfrey Chan2014-01-292-2/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: >> ActiveRecord::Base.respond_to?(:find_by_something) NoMethodError: undefined method `abstract_class?' for Object:Class After: >> ActiveRecord::Base.respond_to?(:find_by_something) => false
* | | | | | | | Update CHANGELOG properly with GH #13692 [ci-skip]Guillermo Iguaran2014-01-291-14/+14
| | | | | | | |
* | | | | | | | Merge pull request #13692 from lukesarnacki/change-default-session-serializerGuillermo Iguaran2014-01-2911-10/+121
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow session serializer key in config.session_store
| * | | | | | | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-2911-10/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* | | | | | | | | Merge pull request #13868 from mauricio/bug-13788Yves Senn2014-01-293-1/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Correctly send the string given to lock! and reload(:lock) to the lock scope - fixes #13788
| * | | | | | | | Correctly send the string given to lock! and reload(:lock) to the lock scope ↵Mauricio Linhares2014-01-293-1/+22
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixes #13788 As per the documentation at lock!, if the :lock option is a string it should use the given SQL to generate the lock statement.
* | | | | | | | always use a block for cleanup / prepare callbacks so we can clean the ↵Aaron Patterson2014-01-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method signature
* | | | | | | | scope is not necessaryAaron Patterson2014-01-281-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #13864 from sowjumn/masterRafael Mendonça França2014-01-281-1/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Added documentation for css_compressor in asset_pipeline.md
| * | | | | | | Added documentation for css_compressorsowjanya2014-01-281-1/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 02:06:09 +0000