Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bug, when ':dependent => :destroy' option violates foreign key ↵ | Ivan Antropov | 2013-10-26 | 5 | -9/+61 |
| | | | | constraints, issue #12380 | ||||
* | 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. | ||||
* | | | Merge pull request #12338 from JuanitoFatas/generator | Yves Senn | 2013-09-26 | 1 | -3/+18 |
|\ \ \ | | | | | | | | | [ci skip] Update scaffold output and change some words. | ||||
| * | | | [ci skip] Update scaffold output and change some words. | Juanito Fatas | 2013-09-27 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaffold output: add jbuilder, update timestamp (edge guide!) Add some file breadcrumb (comment) to help reader find files. Improve readability by adding some command outputs. Thanks for great help from @senny. | ||||
* | | | | Merge pull request #12373 from francisgo/patch-6 | Yves Senn | 2013-09-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Getting Started Guide: post.rb -> Post [ci skip] | ||||
| * | | | | Getting Started Guide: post.rb -> Post | Francis Go | 2013-09-26 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #12371 from cciollaro/master | Yves Senn | 2013-09-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ci skip] escape unintended url in docs | ||||
| * | | | | [ci skip] escape unintended url in docs | Chris Ciollaro | 2013-09-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12349 from odigity/master | Yves Senn | 2013-09-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | added "id: false" to HABTM join table example [ci skip] | ||||
| * | | | | added "id: false" to HABTM join table example | Ofer Nave | 2013-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Based on the instructions further down in section 3.3.2. | ||||
* | | | | | Merge pull request #12356 from francisgo/patch-3 | Yves Senn | 2013-09-26 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Getting Started Guide: posts_controller -> PostsController [ci skip] | ||||
| * | | | | | Getting Started Guide: posts_controller -> PostsController [ci skip] | Francis Go | 2013-09-26 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #12357 from JuanitoFatas/AR-basics | Yves Senn | 2013-09-26 | 1 | -11/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] Add missing periods in active_record_basics.md. | ||||
| * | | | | | | [ci skip] Add missing periods and update link name and some wording. | Juanito Fatas | 2013-09-26 | 1 | -11/+11 |
| |/ / / / / | |||||
* | | | | | | quote `false` reference in querying guide. | Yves Senn | 2013-09-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #12355 from speakingcode/doc-fix | Yves Senn | 2013-09-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Correct error in ActiveRecord Querying guide [ci skip] | ||||
| * | | | | | | [ci skip] Correct the explanation of the example for find_or_create_by when ↵ | Daniel Lissner | 2013-09-25 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | used with create_with in ActiveRecord Querying guide | ||||
* | | | | | | Merge pull request #12368 from francisgo/patch-5 | Yves Senn | 2013-09-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Getting Started Guide: update link_to string argument to use single-quote [ci skip] | ||||
| * | | | | | Getting Started Guide: update link_to string argument to use single-quote ↵ | Francis Go | 2013-09-26 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | mark, following document style [ci skip] | ||||
* | | | | | Merge pull request #12363 from jbaudanza/doc | Rafael Mendonça França | 2013-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix small typo in docs | ||||
| * | | | | | Fix small typo in docs | Jonathan Baudanza | 2013-09-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #12362 from arthurnn/inverse_on_find | Rafael Mendonça França | 2013-09-25 | 3 | -5/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix .find when inverse is loaded | ||||
| * | | | | | changelog entry | Arthur Neves | 2013-09-25 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | fix .find when inverse is set | Arthur Neves | 2013-09-25 | 2 | -5/+16 |
|/ / / / / | | | | | | | | | | | | | | | | .find([1]) should return an Array of entries, even when a invese object is in memory already | ||||
* | | | | | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 4 | -2/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Make sure inverse_of is visible on the has_many callbacks | ||||
| * | | | | | update changelog for #12359 | Arthur Neves | 2013-09-25 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Make sure inverse_of is visible on the has_many callbacks | Arthur Neves | 2013-09-25 | 3 | -1/+13 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into preload | Aaron Patterson | 2013-09-25 | 79 | -201/+735 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ... | ||||
| * | | | | Merge pull request #12290 from kennyj/fix_12278 | Andrew White | 2013-09-24 | 3 | -3/+28 |
| |\ \ \ \ | | | | | | | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone. | ||||
| | * | | | | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵ | kennyj | 2013-09-25 | 3 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | string with timezone. Closes #12278. | ||||
| * | | | | | Merge pull request #12351 from francisgo/patch-2 | Rafael Mendonça França | 2013-09-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag | ||||
| | * | | | | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag | Francis Go | 2013-09-25 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Add CHANGELOG entry for #12344 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Merge pull request #12344 from angelic/collection_check_boxes_with_name | Rafael Mendonça França | 2013-09-24 | 2 | -1/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Use the given name in html_options for the hidden field in collection_ch... | ||||
| | * | | | | | Use the given name in html_options for the hidden field in ↵ | Angel N. Sciortino | 2013-09-24 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection_check_boxes | ||||
| * | | | | | | Add regression test to #12343 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+5 |
| | | | | | | |