Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8139 from ↵ | Carlos Antonio da Silva | 2012-11-08 | 4 | -3/+18 |
|\ | | | | | | | | | senny/8121_engine_generator_rakefile_without_test_unit Add app Rake tasks when -T and --dummy-path is passed to `plugin new` | ||||
| * | `plugin new` adds dummy app tasks when necessary. | Yves Senn | 2012-11-08 | 4 | -3/+18 |
|/ | | | | | | | Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. | ||||
* | Remove not used indifferent_access requires from Base and FinderMethods | Carlos Antonio da Silva | 2012-11-07 | 2 | -3/+0 |
| | |||||
* | Use cached quoted_table_name instead of going through the connection | Carlos Antonio da Silva | 2012-11-07 | 1 | -1/+1 |
| | |||||
* | Remove block given check from private find_with_ids | Carlos Antonio da Silva | 2012-11-07 | 1 | -2/+0 |
| | | | | | This is already handled by #find, it's a duplicate check, since find_with_ids is not called from anywhere else. | ||||
* | Fix guides home links and maintain compatibility with small screens | Carlos Antonio da Silva | 2012-11-07 | 1 | -1/+7 |
| | | | | | | | | | Commit 65a2977cdd55678d3eab06434625375914511786 has introduced some changes to format content for small devices, this change reverts the original font size for normal screens while maintaing the same format for these devices. [ci skip] | ||||
* | Do not strip code blocks, otherwise we may get misaligned output | Carlos Antonio da Silva | 2012-11-07 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | stop raising so many exceptions | Aaron Patterson | 2012-11-07 | 1 | -1/+5 |
| | |||||
* | adding requires for constant dependencies | Aaron Patterson | 2012-11-07 | 2 | -0/+6 |
| | |||||
* | cleaning up constantize tests | Aaron Patterson | 2012-11-07 | 1 | -44/+44 |
| | |||||
* | fix warnings in Ruby 2.0 | Aaron Patterson | 2012-11-07 | 2 | -0/+4 |
| | |||||
* | Merge pull request #8132 from bquorning/permitted_is_sticky_on_slice | Carlos Antonio da Silva | 2012-11-06 | 2 | -7/+34 |
|\ | | | | | Permitted should be sticky on #slice | ||||
| * | Set @permitted on new instance when slicing parameters hash | Benjamin Quorning | 2012-11-06 | 1 | -1/+3 |
| | | |||||
| * | Test that permitted? is sticky on accessors, mutators, and merges | Benjamin Quorning | 2012-11-06 | 1 | -0/+24 |
| | | |||||
| * | Test that not permitted is sticky on #except | Benjamin Quorning | 2012-11-06 | 1 | -0/+1 |
| | | |||||
| * | Current tests are testing stickiness of non-permitted parameters | Benjamin Quorning | 2012-11-06 | 1 | -3/+3 |
| | | |||||
| * | Fix buggy tests | Benjamin Quorning | 2012-11-06 | 1 | -4/+4 |
|/ | |||||
* | Update mocha github repo to new one | Carlos Antonio da Silva | 2012-11-06 | 1 | -1/+1 |
| | |||||
* | mocha_standalone is now deprecated. Switch to mocha/api. | Jeremy Kemper | 2012-11-05 | 2 | -2/+2 |
| | |||||
* | Make the tests pass with minitest 4.2 | Rafael Mendonça França | 2012-11-05 | 1 | -0/+3 |
| | |||||
* | 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] |