Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #8118 from nashby/activemodel-errors | Rafael Mendonça França | 2012-11-05 | 3 | -23/+41 | |
|\ \ \ \ \ | | | | | | | | | | | | | use Array() instead of flatten | |||||
| * | | | | | use Array() instead flatten | Vasiliy Ermolovich | 2012-11-05 | 3 | -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::TaggedLogging | Carlos Antonio da Silva | 2012-11-05 | 1 | -4/+0 | |
|/ / / / / | ||||||
* | | | | | Minor css style improvements | Carlos Antonio da Silva | 2012-11-04 | 1 | -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 guide | Carlos Antonio da Silva | 2012-11-04 | 1 | -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 order | Carlos Antonio da Silva | 2012-11-04 | 1 | -6/+4 | |
| | | | | | ||||||
* | | | | | Add ensure block to make sure the state is properly restored | Carlos Antonio da Silva | 2012-11-04 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Remove some line breaks between array items that make the assert file tests ↵ | Carlos Antonio da Silva | 2012-11-04 | 4 | -42/+19 | |
| | | | | | | | | | | | | | | | | | | | | harder to read | |||||
* | | | | | Refactor Inflector#ordinal to avoid converting the number twice | Carlos Antonio da Silva | 2012-11-04 | 1 | -2/+4 | |
| | | | | | ||||||
* | | | | | Fix typo in test name | Carlos Antonio da Silva | 2012-11-04 | 2 | -3/+2 | |
|/ / / / | ||||||
* | | | | Raise ArgumentError when no attribute is given to AMo::EachValidator | Carlos Antonio da Silva | 2012-11-04 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | ArgumentError is better suited than RuntimeError for this. | |||||
* | | | | Set hash value instead of using merge! | Carlos Antonio da Silva | 2012-11-04 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #8111 from ↵ | Carlos Antonio da Silva | 2012-11-04 | 3 | -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 Afanasenko | 2012-11-04 | 3 | -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 failure | Carlos Antonio da Silva | 2012-11-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | Simplify query conditions a bit in nested attributes test | Carlos Antonio da Silva | 2012-11-03 | 1 | -5/+3 | |
| | | | | | | | | | | | | Also refactor the test a bit. | |||||
* | | | Remove #permitted attr accessor from Parameters | Carlos Antonio da Silva | 2012-11-03 | 1 | -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 deprecation | Rafael Mendonça França | 2012-11-03 | 2 | -6/+8 | |
|/ / | | | | | | | message | |||||
* | | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag | Rafael Mendonça França | 2012-11-02 | 3 | -6/+17 | |
|\ \ | | | | | | | Support :multiple option on input tags that also have :index | |||||
| * | | Support :multiple option on input tags with :index | Daniel Fox, Grant Hutchins & Trace Wax | 2012-11-02 | 3 | -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 comment | Rafael Mendonça França | 2012-11-02 | 1 | -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ça | 2012-11-02 | 3 | -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 routes | Santiago Pastorino | 2012-11-02 | 2 | -0/+5 | |
| | | ||||||
* | | Raise an ArgumentError when passing an invalid option to add_index | Rafael Mendonça França | 2012-11-02 | 3 | -1/+14 | |
| | | | | | | | | Closes #8104 | |||||
* | | Merge pull request #8106 from steveklabnik/fix_grammar | Carlos Antonio da Silva | 2012-11-02 | 1 | -1/+1 | |
|\ \ | | | | | | | Fixed grammar in migration pending error. | |||||
| * | | Fixed grammar in migration pending error. | Steve Klabnik | 2012-11-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 105 | -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 Dev | 2012-11-03 | 2 | -7/+4 | |
| | | | | ||||||
| * | | | Revert "Updated activerecord test comments to new hash syntax" | Vijay Dev | 2012-11-03 | 2 | -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 Dev | 2012-11-03 | 1 | -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. | kennyj | 2012-11-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 1.9 hash syntax changes to docs | AvnerCohen | 2012-10-31 | 18 | -169/+169 | |
| | | | | ||||||
| * | | | Hash Syntax to 1.9 related changes | AvnerCohen | 2012-10-29 | 20 | -346/+346 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Juanjo Bazán | 2012-10-29 | 1 | -21/+1 | |
| |\ \ \ | ||||||
| | * | | | dont encourage AC::Parameters#permit_all_parameters usage [ci skip] | Francesco Rodriguez | 2012-10-28 | 1 | -21/+1 | |
| | | | | | ||||||
| * | | | | 3.1 and up, in configuring guide. | Juanjo Bazán | 2012-10-29 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' of https://github.com/lifo/docrails | John Gallagher | 2012-10-27 | 15 | -77/+77 | |
| |\ \ \ | ||||||
| | * | | | Multiple changes to 1,9 hash syntax | AvnerCohen | 2012-10-27 | 15 | -77/+77 | |
| | | | | | ||||||
| * | | | | Changed comment section to be more explicit. I had an issue with rolling ↵ | John Gallagher | 2012-10-27 | 1 | -2/+3 | |
| |/ / / | | | | | | | | | | | | | back a migration and couldn't understand why 'rake db:reset' didn't work. | |||||
| * | | | Use a better word | Agis Anastasopoulos | 2012-10-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | update AR::ImmutableRelation documentation [ci skip] | Francesco Rodriguez | 2012-10-26 | 1 | -0/+14 | |
| | | | | ||||||
| * | | | Fix a pair of typos on Active Record Querying guide | Jaime Iniesta | 2012-10-26 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | minor edits and remove mixed titles in AM::Validations docs [ci skip] | Francesco Rodriguez | 2012-10-25 | 9 | -21/+13 | |
| | | | | ||||||
| * | | | encourage use of Ruby 1.9 syntax [ci skip] | Francesco Rodriguez | 2012-10-25 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | AJAX -> Ajax in layouts_and_rendering guide. | Henrik N | 2012-10-25 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | Fixed in the JS guide in 8c38172ba59e16d8e523ac4f1c5ae29b6851d3ee | |||||
| * | | | Revert "Improve grammar a bit" | Xavier Noria | 2012-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 507e522e26b4073455b2337bcf1670e52bba5429. | |||||
| * | | | Revert "Explain where the acronym AJAX stands for & replace "JavaScript ↵ | Xavier Noria | 2012-10-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | writer" with "JavaScript developer"" This reverts commit 1332cf53af981d0a7a6f801edd9632eb5c118a3f. | |||||
| * | | | Revert "Improve "request response" term typing & fix a minor typo" | Xavier Noria | 2012-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit a6d383c8b2afb253c009ad67d31aae3aa8dcc457. | |||||
| * | | | Revert "fix a typo" | Xavier Noria | 2012-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 6d927fb4da7a0a17d62109b7ef8798a8e75082a7. | |||||
| * | | | Revert "Consistent headlines & ToC" | Xavier Noria | 2012-10-24 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | This reverts commit 506257a173bb5cbb083ccae8d1b4ed82a456006a. |