Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 4 | -0/+31 |
|\ | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | ||||
| * | Changed the changelog and documentation about | Angelo Capilleri | 2012-05-13 | 2 | -0/+5 |
| | | | | | | | | | | the select method (tag select) forces :include_blank if is required and no multiple and display size is one | ||||
| * | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 2 | -0/+26 |
| | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
* | | Merge pull request #6193 from mhfs/fix_oracle_spec | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 |
|\ \ | | | | | | | Fix failing AR test on Oracle | ||||
| * | | Fix failing test on Oracle. Having a duplicated column specified in a | Marcelo Silveira | 2012-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147). | ||||
* | | | Merge pull request #6171 from oscardelben/move_token_tag_if_block | Rafael Mendonça França | 2012-05-12 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Switch token_tag if block | ||||
| * | | | Switch token_tag if block | Oscar Del Ben | 2012-05-05 | 1 | -3/+3 |
| | | | | |||||
* | | | | Remove tailing spaces :scissors: [ci skip] | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move AS set configs to AS Raitie | Santiago Pastorino | 2012-05-12 | 2 | -11/+8 |
| | | | | |||||
* | | | | Merge pull request #6271 from homakov/patch-5 | Santiago Pastorino | 2012-05-12 | 1 | -1/+11 |
|\ \ \ \ | | | | | | | | | | | configuration for active_support and JSON Encoding | ||||
| * | | | | Update railties/lib/rails/application/bootstrap.rb | Egor Homakov | 2012-05-11 | 1 | -1/+11 |
| | | | | | |||||
* | | | | | copy-edits a recent CHANGELOG entry [ci skip] | Xavier Noria | 2012-05-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | update example outputs of some asset helpers | Vijay Dev | 2012-05-12 | 1 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip] | ||||
* | | | | | fixes a nodoc which swallowed the documentation for the rest of the methods ↵ | Vijay Dev | 2012-05-12 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #6285 from ↵ | Vijay Dev | 2012-05-12 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter | ||||
| * | | | | | missplelling error in abstract_mysql_adapter | Angelo Capilleri | 2012-05-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-12 | 19 | -75/+222 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| * | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-12 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | fix incorrect example [ci skip] | Vijay Dev | 2012-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | copy editing [ci skip] | Vijay Dev | 2012-05-12 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | remove docs related to ruby 1.8 from Array#wrap | Vasiliy Ermolovich | 2012-05-12 | 1 | -3/+0 |
| | | | | | | | |||||
| * | | | | | | added examples to Integer#multiple_of? | Francesco Rodriguez | 2012-05-11 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | removing trailing spaces | Francesco Rodriguez | 2012-05-11 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Better document the difference between #clone and #dup. | Erich Menge | 2012-05-11 | 1 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235 | ||||
| * | | | | | | added docs to String#to_datetime | Francesco Rodriguez | 2012-05-11 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | added docs to String#to_date | Francesco Rodriguez | 2012-05-11 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | added examples to String#exclude? | Francesco Rodriguez | 2012-05-11 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | remove unnecessary 'examples' noise | Francesco Rodriguez | 2012-05-11 | 3 | -9/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #97 from ↵ | Scott Johnson | 2012-05-11 | 1 | -0/+15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | itchy/doc_make_engine_ApplicationController_inherit_from_main_app Update engines guide ApplicationController | ||||
| | * | | | | | | update engines guide to show how to have an engine's ApplicationController ↵ | Scott Johnson | 2012-05-11 | 1 | -0/+15 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | inherit from the main application's ApplicationController | ||||
| * | | | | | | fix String#last example | Francesco Rodriguez | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix String#last example | Francesco Rodriguez | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | added docs to String#last | Francesco Rodriguez | 2012-05-11 | 1 | -0/+10 |
| | | | | | | | |||||
| * | | | | | | improve String#first docs | Francesco Rodriguez | 2012-05-11 | 1 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | fix typo in String#first | Francesco Rodriguez | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | added docs to String#first | Francesco Rodriguez | 2012-05-11 | 1 | -0/+11 |
| | | | | | | | |||||
| * | | | | | | added docs to String#from | Francesco Rodriguez | 2012-05-11 | 1 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | improve String#to docs | Francesco Rodriguez | 2012-05-11 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | added docs to String#to | Francesco Rodriguez | 2012-05-11 | 1 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/lifo/docrails | Eric Carty-Fickes | 2012-05-11 | 1 | -0/+25 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | added docs to String#at | Francesco Rodriguez | 2012-05-11 | 1 | -0/+25 |
| | | | | | | | | |||||
| * | | | | | | | Clarify expire_action with namespaced controllers | Eric Carty-Fickes | 2012-05-11 | 1 | -0/+36 |
| |/ / / / / / | |||||
| * | | | | | | better wording | Hrvoje Šimić | 2012-05-11 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | missing 'with' | Hrvoje Šimić | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Move HTTP Token auth docs above the Token module | Elia Schito | 2012-05-11 | 1 | -42/+44 |
| | | | | | | | |||||
| * | | | | | | Update guides/source/configuring.textile | Egor Homakov | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update guides/source/configuring.textile | Egor Homakov | 2012-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix copypaste. [ci skip] | Edward Tsech | 2012-05-11 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Modified template in sample is new.html.erb, not index.html.erb | Ben Wilhelm | 2012-05-10 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | deleting empty lines in docs parts | Francesco Rodriguez | 2012-05-10 | 1 | -8/+0 |
| | | | | | | |