aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-3019-208/+328
|\
| * copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| |
| * let's not add too much details upfront in the introduction [ci skip]Vijay Dev2012-05-301-8/+1
| |
| * Revert "[AR querying guide] Add examples for take(limit), first(limit) and ↵Vijay Dev2012-05-301-48/+0
| | | | | | | | | | | | | | | | | | | | | | | | last(limit)" This reverts commit 724d6fa6bb48b61798c223b47dd27155839c40d5. Reason: This is already documented in another section, albeit without the arguments examples. Let's add them in another commit in the appropriate sections [ci skip]
| * some copy edits [ci skip]Vijay Dev2012-05-301-4/+4
| |
| * fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
| |
| * Revert my own commit, didnt notice that this was intentional. [ci skip]Saulius Grigaliunas2012-05-291-1/+1
| |
| * Routing guide: route constraints are anchored by default, remove ^ ↵Saulius Grigaliunas2012-05-291-1/+1
| | | | | | | | character. [ci skip]
| * fix typo on ActiveSupport instrumentation guide [ci skip]Rafael Magana2012-05-291-1/+1
| |
| * fix example format and add markup in Module#mattr_accessor documentation [ci ↵Francesco Rodriguez2012-05-291-10/+10
| | | | | | | | skip]
| * fix typos on migrations guide [ci skip]Francesco Rodriguez2012-05-281-4/+4
| |
| * [contributing guide] add instructions to update fork [ci skip]Rafael Magana2012-05-281-0/+36
| |
| * Added information regarding the schema_migrations table in Active Record ↵jordanstaub2012-05-281-2/+8
| | | | | | | | Migrations guide.
| * [AR querying guide] Add examples for take(limit), first(limit) and last(limit)Rafael Magana2012-05-281-0/+48
| |
| * change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| |
| * Updates Array conversions method documentations and clean upsAlvaro Pereyra2012-05-281-4/+0
| |
| * Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| |
| * add ActiveSupport::JSON.decode documentation [ci skip]Francesco Rodriguez2012-05-281-0/+5
| |
| * add example to ActiveSupport::JSON.encode [ci skip]Francesco Rodriguez2012-05-281-1/+4
| |
| * fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| |
| * Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-282-2/+0
| |\
| | * fix empty lines [ci skip]Francesco Rodriguez2012-05-282-2/+0
| | |
| * | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| |/
| * Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-28320-683/+3195
| |\
| | * remove :nodoc: from Class#subclasses [ci skip]Francesco Rodriguez2012-05-281-4/+10
| | |
| | * [command line guide] Use actual output of a Rails 3.2.x appRafael Magana2012-05-281-102/+96
| | |
| | * Merge pull request #102 from xenda/masterXenda2012-05-271-4/+4
| | |\ | | | | | | | | Small fix to update the README using more up to date conventions.
| | * | add :locale option to Array#to_sentence documentation [ci skip]Francesco Rodriguez2012-05-281-0/+27
| | | |
| | * | add examples to Array#to_sentence [ci skip]Francesco Rodriguez2012-05-281-4/+24
| | | |
| | * | update documentation of array/access methods [ci skip]Francesco Rodriguez2012-05-281-8/+16
| | | |
| | * | [security guide] use info, note and warning where applicableRafael Magana2012-05-281-34/+34
| | | |
| | * | Merge pull request #101 from lazylester/masterFrancesco Rodríguez2012-05-271-0/+6
| | |\ \ | | | | | | | | | | small addition to engines guide
| | | * | add small note about how to get the full list of options for rails plugin newLes Nightingill2012-05-261-0/+6
| | | | |
| | * | | "a sql" -> "an SQL" per API documentation guidelinesMark Rushakoff2012-05-272-2/+2
| | | | |
| | * | | some asset path changes and formatting fixes in AV overview [ci skip]Vijay Dev2012-05-271-12/+10
| | | | |
| * | | | Adds examples to FinderMethods#first [ci skip]Alvaro Pereyra2012-05-281-0/+1
| | | | |
| * | | | Updates documentation with cleaner examples and texts [ci skip]Alvaro Pereyra2012-05-282-1/+15
| | |_|/ | |/| |
| * | | Updates validations examples to be more attuned on the new Rails 3.0 conventionsAlvaro Pereyra2012-05-281-4/+4
| | | |
* | | | Merge pull request #6551 from kennyj/add_entry_20120531José Valim2012-05-301-0/+2
|\ \ \ \ | | | | | | | | | | Add a railtie's changelog entry about runner hook.
| * | | | Add a changelog entry about runner hook.kennyj2012-05-311-0/+2
|/ / / /
* | | | Merge pull request #6550 from arunagw/warning_removed_assert_matchJosé Valim2012-05-305-33/+33
|\ \ \ \ | | | | | | | | | | Some of the warnings removed from "railties"
| * | | | Unused variable warning removed.Arun Agrawal2012-05-301-1/+1
| | | | |
| * | | | More assert_match warnings fixed.Arun Agrawal2012-05-304-12/+12
| | | | |
| * | | | Warnings removed for "assert_match /".Arun Agrawal2012-05-301-20/+20
|/ / / /
* | | | Merge pull request #5843 from ↵José Valim2012-05-292-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kuroda/translation_of_deeply_nested_model_attributes Fix human attribute_name to handle deeply nested attributes
| * | | | Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-05-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a model nests another model that also nests yet another model using accepts_nested_attributes_for method, its Errors object can have an attribute name with "contacts.addresses.street" style. In this case, the dots within the namespace should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person/contacts/addresses.street" key. This commit is related to #3859.
* | | | | Merge pull request #6546 from erichmenge/patch-as-jsonJeremy Kemper2012-05-292-9/+15
|\ \ \ \ \ | | | | | | | | | | | | True, False, and Nil should be represented in as_json as themselves.
| * | | | | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-292-9/+15
|/ / / / /
* | | | | Merge pull request #6502 from rafmagana/guides_refactor_rakefileXavier Noria2012-05-293-22/+89
|\ \ \ \ \ | | | | | | | | | | | | [Guides] refactor rakefile to have a :guides namespace and a task that shows help
| * | | | | [guides] fix reference to railties directory, guides are no longer thereRafael Magana2012-05-281-1/+1
| | | | | |