aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #8118 from nashby/activemodel-errorsRafael Mendonça França2012-11-053-23/+41
|\ \ \ \ \ | | | | | | | | | | | | use Array() instead of flatten
| * | | | | use Array() instead flattenVasiliy Ermolovich2012-11-053-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move ActiveModel::Errors tests to errors_test.rb * add spec coverage for add_on_empty and add_on_blank
* | | | | | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
|/ / / / /
* | | | | Minor css style improvementsCarlos Antonio da Silva2012-11-041-47/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some indenting for some properties and closing }, remove tabs, and merge two pre/code definitions. [ci skip]
* | | | | Restore index link states to the way they are in current guideCarlos Antonio da Silva2012-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current stable guides show the "Guides Index" links without underline, just showing it when it's hovered. This restores the same functionality for edge guides. Also remove annoying pointer cursor while accessing guides index, restoring previously functionality: now the pointer cursor only appears when hovering a link. Closes #8107 [ci skip]
* | | | | Use flat_map when building AR orderCarlos Antonio da Silva2012-11-041-6/+4
| | | | |
* | | | | Add ensure block to make sure the state is properly restoredCarlos Antonio da Silva2012-11-042-2/+2
| | | | |
* | | | | Remove some line breaks between array items that make the assert file tests ↵Carlos Antonio da Silva2012-11-044-42/+19
| | | | | | | | | | | | | | | | | | | | harder to read
* | | | | Refactor Inflector#ordinal to avoid converting the number twiceCarlos Antonio da Silva2012-11-041-2/+4
| | | | |
* | | | | Fix typo in test nameCarlos Antonio da Silva2012-11-042-3/+2
|/ / / /
* | | | Raise ArgumentError when no attribute is given to AMo::EachValidatorCarlos Antonio da Silva2012-11-042-2/+2
| | | | | | | | | | | | | | | | ArgumentError is better suited than RuntimeError for this.
* | | | Set hash value instead of using merge!Carlos Antonio da Silva2012-11-041-1/+1
| |_|/ |/| |
* | | Merge pull request #8111 from ↵Carlos Antonio da Silva2012-11-043-5/+9
|\ \ \ | | | | | | | | | | | | | | | | nikitug/use_tag_instead_of_method_missing_in_xml_builder Use `tag!` instead of `method_missing` in `to_xml` conversions.
| * | | Use `tag!` instead of `method_missing` in `to_xml` conversions.Nikita Afanasenko2012-11-043-5/+9
| |/ / | | | | | | | | | Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder.
* | | Ensure nested attributes is restored in case of a test failureCarlos Antonio da Silva2012-11-031-1/+1
| | |
* | | Simplify query conditions a bit in nested attributes testCarlos Antonio da Silva2012-11-031-5/+3
| | | | | | | | | | | | Also refactor the test a bit.
* | | Remove #permitted attr accessor from ParametersCarlos Antonio da Silva2012-11-031-1/+0
| | | | | | | | | | | | | | | There is no need to expose this accessor since we already have the query method #permitted? that should handle this purpose.
* | | Check if the options value is present before to send the deprecationRafael Mendonça França2012-11-032-6/+8
|/ / | | | | | | message
* | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-023-6/+17
|\ \ | | | | | | Support :multiple option on input tags that also have :index
| * | Support :multiple option on input tags with :indexDaniel Fox, Grant Hutchins & Trace Wax2012-11-023-6/+17
|/ / | | | | | | | | When you have an explicit index set, then when you build an input tag with :multiple => true, it doesn't add [] to the end of its name, although it should.
* | Remove old commentRafael Mendonça França2012-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment is not valid since that `if` is there to make possible to do: remove_index :users, :name Instead of: remove_index :users, column: :name What is a valid use case. [ci skip]
* | Deprecate passing a string as third argument of `add_index`Rafael Mendonça França2012-11-023-0/+23
| | | | | | | | | | | | | | This was there due historical reasons since 7dc45818dc43c163700efc9896a0f3feafa31138 to give the user the possibility to create unique indexes passing "UNIQUE" as the third argument
* | Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
| |
* | Raise an ArgumentError when passing an invalid option to add_indexRafael Mendonça França2012-11-023-1/+14
| | | | | | | | Closes #8104
* | Merge pull request #8106 from steveklabnik/fix_grammarCarlos Antonio da Silva2012-11-021-1/+1
|\ \ | | | | | | Fixed grammar in migration pending error.
| * | Fixed grammar in migration pending error.Steve Klabnik2012-11-021-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-03105-809/+873
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md
| * | | copy edits [ci skip]Vijay Dev2012-11-032-7/+4
| | | |
| * | | Revert "Updated activerecord test comments to new hash syntax"Vijay Dev2012-11-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3b89052014c2bf3b8fbbcfb93f657a17dd7e7ca3. Reason: changes made to a test, albeit in commented lines - non-uniform change. [ci skip]
| * | | Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci skip]"Vijay Dev2012-11-031-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cd17ee5598411728747011566abf6779166be9d3. Reason: Let's note that this is discouraged, not remove the docs [ci skip]
| * | | This is comment for singular association.kennyj2012-11-021-1/+1
| | | |
| * | | 1.9 hash syntax changes to docsAvnerCohen2012-10-3118-169/+169
| | | |
| * | | Hash Syntax to 1.9 related changesAvnerCohen2012-10-2920-346/+346
| | | |
| * | | Merge branch 'master' of github.com:lifo/docrailsJuanjo Bazán2012-10-291-21/+1
| |\ \ \
| | * | | dont encourage AC::Parameters#permit_all_parameters usage [ci skip]Francesco Rodriguez2012-10-281-21/+1
| | | | |
| * | | | 3.1 and up, in configuring guide.Juanjo Bazán2012-10-291-1/+1
| |/ / /
| * | | Merge branch 'master' of https://github.com/lifo/docrailsJohn Gallagher2012-10-2715-77/+77
| |\ \ \
| | * | | Multiple changes to 1,9 hash syntaxAvnerCohen2012-10-2715-77/+77
| | | | |
| * | | | Changed comment section to be more explicit. I had an issue with rolling ↵John Gallagher2012-10-271-2/+3
| |/ / / | | | | | | | | | | | | back a migration and couldn't understand why 'rake db:reset' didn't work.
| * | | Use a better wordAgis Anastasopoulos2012-10-261-1/+1
| | | |
| * | | update AR::ImmutableRelation documentation [ci skip]Francesco Rodriguez2012-10-261-0/+14
| | | |
| * | | Fix a pair of typos on Active Record Querying guideJaime Iniesta2012-10-261-2/+2
| | | |
| * | | minor edits and remove mixed titles in AM::Validations docs [ci skip]Francesco Rodriguez2012-10-259-21/+13
| | | |
| * | | encourage use of Ruby 1.9 syntax [ci skip]Francesco Rodriguez2012-10-251-0/+1
| | | |
| * | | AJAX -> Ajax in layouts_and_rendering guide.Henrik N2012-10-251-3/+3
| | | | | | | | | | | | | | | | Fixed in the JS guide in 8c38172ba59e16d8e523ac4f1c5ae29b6851d3ee
| * | | Revert "Improve grammar a bit"Xavier Noria2012-10-241-1/+1
| | | | | | | | | | | | | | | | This reverts commit 507e522e26b4073455b2337bcf1670e52bba5429.
| * | | Revert "Explain where the acronym AJAX stands for & replace "JavaScript ↵Xavier Noria2012-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | writer" with "JavaScript developer"" This reverts commit 1332cf53af981d0a7a6f801edd9632eb5c118a3f.
| * | | Revert "Improve "request response" term typing & fix a minor typo"Xavier Noria2012-10-241-1/+1
| | | | | | | | | | | | | | | | This reverts commit a6d383c8b2afb253c009ad67d31aae3aa8dcc457.
| * | | Revert "fix a typo"Xavier Noria2012-10-241-1/+1
| | | | | | | | | | | | | | | | This reverts commit 6d927fb4da7a0a17d62109b7ef8798a8e75082a7.
| * | | Revert "Consistent headlines & ToC"Xavier Noria2012-10-241-5/+5
| | | | | | | | | | | | | | | | This reverts commit 506257a173bb5cbb083ccae8d1b4ed82a456006a.