aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13068 from chancancode/drop_yajl_from_gemfileCarlos Antonio da Silva2013-11-271-1/+0
|\ | | | | Dropped yajl from Gemfile
| * Dropped yajl from GemfileGodfrey Chan2013-11-261-1/+0
| |
* | Merge pull request #13069 from chancancode/json_gem_versionCarlos Antonio da Silva2013-11-272-2/+6
|\ \ | | | | | | Requires JSON gem version 1.7.7 or above as it contains an important security fix.
| * | Requires JSON gem version 1.7.7 or above as it contains an importantGodfrey Chan2013-11-262-2/+6
| |/ | | | | | | security fix.
* | Merge pull request #13071 from kuldeepaggarwal/documentation-updationYves Senn2013-11-271-3/+0
|\ \ | | | | | | [ci skip]removed obsolete information about `options` parameter in create method
| * | [ci skip]removed obsolete information about `options` parameter in create methodKuldeep Aggarwal2013-11-271-3/+0
|/ /
* | Merge pull request #13070 from kuldeepaggarwal/documentation-updationYves Senn2013-11-271-1/+1
|\ \ | |/ |/| [ci skip] used new syntax for scopes
| * [ci skip] used new syntax for scopesKuldeep Aggarwal2013-11-271-1/+1
|/
* Merge pull request #13061 from ↵Rafael Mendonça França2013-11-263-1/+23
| | | | | | | | laurocaetano/fix-uniqueness-validation-for-aliased-attribute Fix bug when validating the uniqueness of an aliased attribute. Conflicts: activerecord/CHANGELOG.md
* Merge pull request #12183 from chancancode/json_encoder_refactorJeremy Kemper2013-11-263-113/+107
|\ | | | | JSON encoder refactor
| * Be explicit and use the actual unicode sequenceGodfrey Chan2013-11-261-1/+1
| |
| * Process::Status should get a :nodoc: [ci skip]Godfrey Chan2013-11-261-1/+1
| |
| * Make the JSON encoder pluggableGodfrey Chan2013-11-261-2/+8
| |
| * Removed the Ruby encoder and switched to using the JSON gemGodfrey Chan2013-11-263-82/+74
| | | | | | | | | | | | | | | | | | Got all the tests passing again. Support for `encode_json` has been removed (and consequently the ability to encode `BigDecimal`s as numbers, as mentioned in the previous commit). Install the `activesupport-json_encoder` gem to get it back.
| * Removed support for encoding BigDecimal as a JSON numberGodfrey Chan2013-11-263-25/+1
| | | | | | | | | | | | | | | | | | | | This is because the new encoder will no longer support encode_json. Therefore our only choice is to return `to_i` or `to_s` in `BigDecimal#as_json`. Since casting a BigDecimal to an integer is most likely a lossy operation, we chose to encode it as a string. Support for encoding BigDecimal as a string will return via the `activesupport-json_encoder` gem.
| * Expanded coverage on JSON encodingGodfrey Chan2013-11-261-2/+12
| |
| * Added some failing tests where the JSON encoder is not resolving as_json ↵Godfrey Chan2013-11-261-2/+12
| | | | | | | | correctly
* | More typo fixesAkira Matsuda2013-11-272-2/+2
|/
* Minor typo fixesAkira Matsuda2013-11-274-6/+6
|
* Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
|
* Merge pull request #13018 from heruku/scoping_fixYves Senn2013-11-264-1/+19
|\ | | | | changed update counter to act on unscoped model
| * changed update counter to act on unscoped modelheruku2013-11-264-1/+19
|/
* Merge pull request #13049 from senny/remove_firebird_testsRafael Mendonça França2013-11-263-148/+0
|\ | | | | remove leftover firebird adapter tests.
| * remove leftover firebird adapter tests.Yves Senn2013-11-263-148/+0
| |
* | sync example and documentation for strong_parameters hash whitelisting.Yves Senn2013-11-261-5/+7
| | | | | | | | | | | | | | | | | | [ci skip] This is a follow up to #12609 and integrates #12158. Thanks @aspiers. Closes #12158.
* | tyopAkira Matsuda2013-11-261-1/+1
|/
* `rename_index`: add the new index before removing the old one.Yves Senn2013-11-263-8/+29
| | | | | | | | | | | This prevents the following error when a MySQL index on a foreign key column is renamed: ``` ActiveRecord::StatementInvalid: Mysql2::Error: Cannot drop index 'index_engines_on_car_id': needed in a foreign key constraint: DROP INDEX `index_engines_on_car_id` ON `engines` ``` refs: #13038.
* Merge pull request #13042 from brianstorti/fix-dependent-destroy-12812Rafael Mendonça França2013-11-255-1/+25
|\ | | | | Raise `RecordNotDestroyed` when children can't be replaced
| * move changelog entry to the topBrian Thomas Storti2013-11-251-6/+6
| |
| * Raise `RecordNotDestroyed` when children can't be replacedBrian Thomas Storti2013-11-255-1/+25
|/ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12812 Raise `ActiveRecord::RecordNotDestroyed` when a child marked with `dependent: destroy` can't be destroyed. The following code: ```ruby class Post < ActiveRecord::Base has_many :comments, dependent: :destroy end class Comment < ActiveRecord::Base before_destroy do return false end end post = Post.create!(comments: [Comment.create!]) post.comments = [Comment.create!] ```` would result in a `post` with two `comments`. With this commit, the same code would raise a `RecordNotDestroyed` exception, keeping the `post` with the same `comment`.
* require the files we testAaron Patterson2013-11-251-0/+1
|
* Merge pull request #13034 from vipulnsward/some_typosRafael Mendonça França2013-11-252-2/+2
|\ | | | | Fix some minor typos
| * Fix some minor typos [ci skip]Vipul A M2013-11-262-2/+2
| |
* | Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor"Carlos Antonio da Silva2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit f4a5a9ea4d183f4102796215d4502c46dbe3e52b, reversing changes made to 7ccb482181ee6c47c765406009018a15172812de. Reason: The logic is different, the first call to #option_value_selected? is for the :selected option (the argument is the "selected" variable), the second call is for the :disabled option (the argument is the "disabled" variable).
* | Merge pull request #13027 from akshay-vishnoi/f-refactorYves Senn2013-11-251-1/+1
|\ \ | | | | | | avoiding calling of #option_value_selected? two times
| * | avoiding calling of #option_value_selected? two timesAkshay Vishnoi2013-11-251-1/+1
| | |
* | | Merge pull request #13029 from akshay-vishnoi/documentationYves Senn2013-11-251-4/+4
|\ \ \ | |_|/ |/| | `delgated` => `delegated`
| * | `delgated` => `delegated`Akshay Vishnoi2013-11-251-4/+4
| | |
* | | Merge pull request #13025 from pwnall/nice_testYves Senn2013-11-253-0/+19
|\ \ \ | | | | | | | | Better error message for typos in assert_response argument.
| * | | Better error message for typos in assert_response argument.Victor Costan2013-11-253-0/+19
|/ / / | | | | | | | | | | | | This commit makes it really easy to debug errors due to typos like "assert_response :succezz".
* | | Merge pull request #13026 from vipulnsward/document_rewhereYves Senn2013-11-241-0/+26
|\ \ \ | | | | | | | | Added `rewhere` usage to AR querying guides
| * | | Added `rewhere` usage to AR querying guidesVipul A M2013-11-251-0/+26
|/ / /
* | | Merge pull request #13020 from razielgn/raise-inspectable-messagesCarlos Antonio da Silva2013-11-242-4/+4
|\ \ \ | | | | | | | | Raise RuntimeErrors with inspectable and MRI-independent messages.
| * | | Raise RuntimeErrors with inspectable and MRI-independent messages.Federico Ravasio2013-11-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Previous behaviour was MRI-dependent, now we're making sure the message is correctly shown: something that can be relyied upon across every Ruby implementation.
* | | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2429-183/+203
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | | | a couple of copy-edits before merging [ci skip]Xavier Noria2013-11-241-3/+2
| | | | |
| * | | | API Documentation Guidelines link correction [ci skip]Harshad Sabne2013-11-231-1/+1
| | | | |
| * | | | Improve reading / style of hashes in AR guideCarlos Antonio da Silva2013-11-191-5/+5
| | | | |
| * | | | Revert last two commits mistakenly changing join/include syntaxCarlos Antonio da Silva2013-11-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Revert "syntax error joining/including models" This reverts commit ac35f72f30c47298a20a90c8c537db888b463bbb. --- Revert "syntax error joining tables" This reverts commit c365986b48c3e8bc8c7f3fa6a8521616ed5dc138. --- Comments: https://github.com/rails/docrails/commit/c365986b48c3e8bc8c7f3fa6a8521616ed5dc138#commitcomment-4630684
| * | | | syntax error joining/including modelsSergio2013-11-181-2/+2
| | | | | | | | | | | | | | | syntax error joining/including models
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 14:49:43 +0000