Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix AR#method_missing re-dispatching into overwritten attribute methods. | thedarkone | 2013-09-29 | 2 | -3/+51 |
| | | | | | | | | | | | | | | This was happening when a `super` call in an overwritten attribute method was triggering a method_missing fallback, because attribute methods haven't been generated yet. class Topic < ActiveRecord::Base def title # `super` would re-invoke this method if define_attribute_methods # hasn't been called yet resulting in double '!' appending super + '!' end end | ||||
* | Merge pull request #12383 from marclennox/master | Rafael Mendonça França | 2013-09-29 | 2 | -2/+11 |
|\ | | | | | Fixed issue #12327 | ||||
| * | Fixed issue #12327 | Marc Lennox | 2013-09-27 | 2 | -2/+11 |
| | | |||||
* | | Merge pull request #12400 from ↵ | Rafael Mendonça França | 2013-09-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | jaredbeck/fixes_guide_re_action_on_unpermitted_parameters Fixes incorrect spelling of `action_on_unpermitted_parameters` in guide | ||||
| * | | fixes incorrect spelling of `action_on_unpermitted_parameters` | Jared Beck | 2013-09-28 | 1 | -1/+1 |
|/ / | | | | | | | See `actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb` | ||||
* | | Merge pull request #12354 from kennyj/fix_12293 | Rafael Mendonça França | 2013-09-28 | 3 | -1/+26 |
|\ \ | | | | | | | Closes #12293. Strong parameters should permit nested number as key. | ||||
| * | | Strong parameters should permit nested number as key. Closes #12293 | kennyj | 2013-09-27 | 3 | -1/+26 |
| | | | |||||
* | | | Merge pull request #12387 from francisgo/patch-9 | Rafael Mendonça França | 2013-09-28 | 1 | -14/+14 |
|\ \ \ | | | | | | | | | Migrations Guide: Add semicolon to sentences before code block [ci skip] | ||||
| * | | | Migrations Guide: Add semicolon to sentences before code block [ci skip] | Francis Go | 2013-09-28 | 1 | -14/+14 |
| | | | | |||||
* | | | | Merge pull request #12398 from thedarkone/thread-safety-stuff | Rafael Mendonça França | 2013-09-28 | 3 | -25/+35 |
|\ \ \ \ | | | | | | | | | | | Thread safety fixes | ||||
| * | | | | Make GTG::TransTable thread safe. | thedarkone | 2013-09-28 | 1 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | From now on only the `[]=` method is allowed to modify the internal states hashes. | ||||
| * | | | | Use TS::Cache instead of Mutex + Hash. | thedarkone | 2013-09-28 | 1 | -12/+8 |
| | | | | | | | | | | | | | | | | | | | | TS::Cache#compute_if_absent guarantees that only a single thread will get to execute the provided block for a given key. | ||||
| * | | | | Replace global Hash with TS::Cache. | thedarkone | 2013-09-28 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #11496 from ↵ | Rafael Mendonça França | 2013-09-28 | 4 | -4/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11376_has_many_assoc_respect_scope_on_build Removed where_values_hash from AR::NullRelation | ||||
| * | | | | | Removed where_values_hash from AR::NullRelation | Paul Nikitochkin | 2013-09-28 | 4 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build associated records for owners which has not been saved need to get where values to use as default attributes. But for new record owner uses `ActiveRecord::NullRelation` which override `where_values_hash` to return empty hash stub. `where_values_hash` is not used to invoke any sql query, but good to build others chains (even will be never executed) like: ```ruby post = Post.new admin_comment = post.admin_comments.build assert_equal 'Admin', admin_comment.author ``` Closes #11376, #11676, #11675 | ||||
* | | | | | | Merge pull request #12396 from arthurnn/cleanup_logsubs | Rafael Mendonça França | 2013-09-28 | 1 | -11/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Cleanup identitymap logger from LogSubscriber | ||||
| * | | | | | | Cleanup identitymap logger from LogSubscriber | Arthur Neves | 2013-09-28 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renaming ivar @odd_or_even to @odd | ||||
* | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-09-28 | 10 | -60/+27 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Added missing active record configurations. | wangjohn | 2013-09-25 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Fix link_to return value | Earl J St Sauver | 2013-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is showing the link_to method as just returning the contents of the url_for method. It should be returning an "<a>" tag with the correct href set. | ||||
| * | | | | | | use active voice and use more descriptive terms | Weston Platter | 2013-09-22 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | `skiping` => `skipping` | Vipul A M | 2013-09-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix Show link on resource | Vipul A M | 2013-09-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | incorrect url | Sergio | 2013-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | incorrect url | ||||
| * | | | | | | incorrect urls | Sergio | 2013-09-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | I've found two incorrects urls for adding ':' at the end of the url | ||||
| * | | | | | | surplus : in attachment_fu plugin | Sergio | 2013-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | surplus ':' character in url | ||||
| * | | | | | | EncryptedCookieStore => CookieStore [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | asset_url => asset-url in sass-rails docs [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Removed doc of diff method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -38/+0 |
| | | | | | | | |||||
| * | | | | | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Updated the file path [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Updated with latest method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Revert ""generates" applies to "collection radio" so it should be singular" | Rafael Mendonça França | 2013-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit faeb33dc036e4f707491c91a23ee3e990573141b. Reason: Code changes can't be done on docrails | ||||
| * | | | | | | take out reference to previous versions of Rails | Waynn Lue | 2013-09-12 | 1 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | "generates" applies to "collection radio" so it should be singular | Waynn Lue | 2013-09-12 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #12391 from francisgo/patch-10 | Yves Senn | 2013-09-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Migrations Guide: Fix line length [ci skip] | ||||
| * | | | | | | Migrations Guide: Fix line length [ci skip] | Francis Go | 2013-09-28 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | adding a test to demonstrate how to use STI subclasses on the far right | Aaron Patterson | 2013-09-27 | 3 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | side of a hm:t association along with preloading. | ||||
* | | | | | | Merge pull request #12388 from rkofman/master | Jeremy Kemper | 2013-09-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fixed grammatical typo in configuring.md guide. | ||||
| * | | | | | Fixed grammatical typo in configuring.md guide. | Roman Kofman | 2013-09-27 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #12385 from francisgo/patch-8 | Guillermo Iguaran | 2013-09-27 | 1 | -0/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip] | ||||
| * | | | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip] | Francis Go | 2013-09-28 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #12366 from francisgo/patch-4 | Yves Senn | 2013-09-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip] | ||||
| * | | | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip] | Francis Go | 2013-09-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12233 from claudiob/delete-actionpack-unused-fixture | Yves Senn | 2013-09-27 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove HelperyTestHelper not used in any test | ||||
| * | | | | | Remove HelperyTestHelper not used in any test | claudiob | 2013-09-14 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HelperyTestHelper was introduced in 66ef922 by @josevalim to pair with HelperyTestController. This test controller was later removed in e10a253 by @strzalek, leaving HelperyTestHelper unused | ||||
* | | | | | | Merge pull request #12379 from francisgo/patch-7 | Yves Senn | 2013-09-27 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Add new line after create action on CommentsController code example [ci skip] | ||||
| * | | | | | Add new line after create action on CommentsController code example | Francis Go | 2013-09-27 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #12376 from tvdeyen/cache-digests-rake-tasks | Rafael Mendonça França | 2013-09-26 | 2 | -0/+21 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Adds template dependencies rake task from cache_digests gem. | ||||
| * | | | | Adds template dependencies rake task from cache_digests gem. | Thomas von Deyen | 2013-09-26 | 2 | -0/+21 |
|/ / / / | | | | | | | | | | | | | This adds the rake tasks `cache_digests:dependencies` and `cache_digests:nested_dependencies` from `cache_digests` gem. |