aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6298 from frodsan/fix_todo_skipRafael Mendonça França2012-05-131-9/+8
|\ | | | | fixme: use minitest skip instead of return nil
| * fix todo: use minitest skip instead of return nilFrancesco Rodriguez2012-05-131-9/+8
| |
* | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ | | | | | | Use the more idiomatic tap method
| * | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
| | |
* | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ \ \ | |_|/ |/| | Improve and cleanup a bit partial renderer
| * | Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template
* | | Copy edit the documentationRafael Mendonça França2012-05-131-1/+1
| | |
* | | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-132-3/+10
| | |
* | | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-132-1/+7
| | |
* | | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-133-17/+25
| | |
* | | Merge pull request #6225 from ↵Rafael Mendonça França2012-05-134-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 aboutAngelo Capilleri2012-05-132-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 attributeangelo giovanni capilleri2012-05-132-0/+26
| | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908
* | | | Merge pull request #6193 from mhfs/fix_oracle_specRafael Mendonça França2012-05-121-1/+1
|\ \ \ \ | | | | | | | | | | Fix failing AR test on Oracle
| * | | | Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-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_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Switch token_tag if block
| * | | | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
| | | | |
* | | | | Remove tailing spaces :scissors: [ci skip]Rafael Mendonça França2012-05-121-1/+1
| | | | |
* | | | | Move AS set configs to AS RaitieSantiago Pastorino2012-05-122-11/+8
| | | | |
* | | | | Merge pull request #6271 from homakov/patch-5Santiago Pastorino2012-05-121-1/+11
|\ \ \ \ \ | | | | | | | | | | | | configuration for active_support and JSON Encoding
| * | | | | Update railties/lib/rails/application/bootstrap.rbEgor Homakov2012-05-111-1/+11
| | | | | |
* | | | | | copy-edits a recent CHANGELOG entry [ci skip]Xavier Noria2012-05-121-1/+1
| | | | | |
* | | | | | update example outputs of some asset helpersVijay Dev2012-05-121-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 Dev2012-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #6285 from ↵Vijay Dev2012-05-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter
| * | | | | | missplelling error in abstract_mysql_adapterAngelo Capilleri2012-05-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1219-75/+222
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | | | | copy edits [ci skip]Vijay Dev2012-05-121-4/+1
| | | | | | | |
| * | | | | | | fix incorrect example [ci skip]Vijay Dev2012-05-121-1/+1
| | | | | | | |
| * | | | | | | copy editing [ci skip]Vijay Dev2012-05-121-5/+5
| | | | | | | |
| * | | | | | | remove docs related to ruby 1.8 from Array#wrapVasiliy Ermolovich2012-05-121-3/+0
| | | | | | | |
| * | | | | | | added examples to Integer#multiple_of?Francesco Rodriguez2012-05-111-0/+4
| | | | | | | |
| * | | | | | | removing trailing spacesFrancesco Rodriguez2012-05-111-3/+3
| | | | | | | |
| * | | | | | | Better document the difference between #clone and #dup.Erich Menge2012-05-111-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235
| * | | | | | | added docs to String#to_datetimeFrancesco Rodriguez2012-05-111-0/+6
| | | | | | | |
| * | | | | | | added docs to String#to_dateFrancesco Rodriguez2012-05-111-0/+6
| | | | | | | |
| * | | | | | | added examples to String#exclude?Francesco Rodriguez2012-05-111-1/+6
| | | | | | | |
| * | | | | | | remove unnecessary 'examples' noiseFrancesco Rodriguez2012-05-113-9/+0
| | | | | | | |
| * | | | | | | Merge pull request #97 from ↵Scott Johnson2012-05-111-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 Johnson2012-05-111-0/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | inherit from the main application's ApplicationController
| * | | | | | | fix String#last exampleFrancesco Rodriguez2012-05-111-1/+1
| | | | | | | |
| * | | | | | | fix String#last exampleFrancesco Rodriguez2012-05-111-1/+1
| | | | | | | |
| * | | | | | | added docs to String#lastFrancesco Rodriguez2012-05-111-0/+10
| | | | | | | |
| * | | | | | | improve String#first docsFrancesco Rodriguez2012-05-111-4/+3
| | | | | | | |
| * | | | | | | fix typo in String#firstFrancesco Rodriguez2012-05-111-1/+1
| | | | | | | |
| * | | | | | | added docs to String#firstFrancesco Rodriguez2012-05-111-0/+11
| | | | | | | |
| * | | | | | | added docs to String#fromFrancesco Rodriguez2012-05-111-0/+13
| | | | | | | |
| * | | | | | | improve String#to docsFrancesco Rodriguez2012-05-111-2/+2
| | | | | | | |
| * | | | | | | added docs to String#toFrancesco Rodriguez2012-05-111-0/+13
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://github.com/lifo/docrailsEric Carty-Fickes2012-05-111-0/+25
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 05:24:04 +0000