aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | added docs to String#atFrancesco Rodriguez2012-05-111-0/+25
| | | | | |
| * | | | | Clarify expire_action with namespaced controllersEric Carty-Fickes2012-05-111-0/+36
| |/ / / /
| * | | | better wordingHrvoje Šimić2012-05-111-4/+4
| | | | |
| * | | | missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | | | |
| * | | | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
| | | | |
| * | | | Update guides/source/configuring.textileEgor Homakov2012-05-111-1/+1
| | | | |
| * | | | Update guides/source/configuring.textileEgor Homakov2012-05-111-1/+1
| | | | |
| * | | | Fix copypaste. [ci skip]Edward Tsech2012-05-111-2/+2
| | | | |
| * | | | Modified template in sample is new.html.erb, not index.html.erbBen Wilhelm2012-05-101-1/+1
| | | | |
| * | | | deleting empty lines in docs partsFrancesco Rodriguez2012-05-101-8/+0
| | | | |
| * | | | remove inappropriate comma Nick Novitski2012-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A qualifying clause beginning with words like "as", "if", or "although" should have a comma separating it from any following clauses in a sentence, but should not have a comma immediately after the beginning word, unless it is to separate a third, non-essential clause. Example 1: "Although I would quite like to go to lunch with you, I find myself instead writing a detailed commit message to justify a single-character documentation change." Example 2: "Despite, as you might well imagine, wishing I hadn't even noticed it in the first place, I still felt the error was worth correcting."
* | | | | s/wether/whether [ci skip]Vijay Dev2012-05-122-2/+2
| | | | |
* | | | | Merge pull request #6277 from homakov/patch-6José Valim2012-05-121-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Comment for active_support's option in application.rb
| * | | | | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-121-0/+3
| | | | | |
* | | | | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.