aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * | | | syntax error joining tablesSergio2013-11-181-5/+5
| | | | | | | | | | | | | | | syntax error joining tables
| * | | | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| | | | |
| * | | | Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| | | | | | | | | | | | | | | Code style adherence
| * | | | Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
| | | | |
| * | | | Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Enumerable.instance_methods & Rails::Configuration::MiddlewareStackProxy.instance_methods # => [:as_json] MiddlewareStackProxy does not share any notable methods with Enumerable.
| * | | | [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17
| | | | |
| * | | | Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
| * | | | Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | | | | | | | | | | | | | Highlighted code
* | | | | Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Updated allow_failures for Rubinius 2.2.1.
| * | | | | Updated allow_failures for Rubinius 2.2.1.Federico Ravasio2013-11-241-1/+1
|/ / / / /
* | | | | Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-242-5/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Rubinius Gemfile and travis fixes
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 02:25:27 +0000