aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #159 from rajcybage/my_fixRafael Mendonça França2013-07-171-4/+4
|\
| * fixes the test case of that pluginsRajarshi Das2013-07-181-4/+4
|/
* New output for scaffold generate [ci skip]Rashmi Yadav2013-07-171-3/+6
* Guides fixed typo in index.html.erb file [ci skip]Arun Agrawal2013-07-171-1/+1
* Merge branch 'master' of github.com:rails/docrailsThiago Pinto2013-07-166-20/+15
|\
| * Added Rack::Sendfile in rake about [ci skip]Arun Agrawal2013-07-151-1/+1
| * Rack Sendfile is coming as default nowArun Agrawal2013-07-151-0/+1
| * Using ruby 1.9 syntax [ci skip]Rashmi Yadav2013-07-141-2/+2
| * Array#to_formatted_s does not call each element's to_s anymoreAkira Matsuda2013-07-111-17/+2
| * Add documentation for FileStore#increment and #decrementMatt Stopa2013-07-101-0/+4
| * Add documentation for #clear on certain Store classesMatt Stopa2013-07-102-0/+2
| * Update the filestore documentation for clearMatt Stopa2013-07-091-0/+3
* | Enhancing readability of options for delegate methodThiago Pinto2013-07-161-0/+5
|/
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-064-2/+43
|\
| * [doc] fixed printing of code samplesArun Agrawal2013-07-021-1/+1
| * Complete a sentence in i18n guide's introductionRobin Dupret2013-06-301-0/+5
| * doc for more input tag typesVishnu Atrai2013-06-291-0/+36
| * cookies are encrypted starting Rails 4Neeraj Singh2013-06-291-1/+1
* | Merge pull request #11314 from raysrashmi/fix-missing-deprecation-stuffRafael Mendonça França2013-07-051-0/+1
|\ \
| * | Adding back deprecation require in all.rbRashmi Yadav2013-07-051-0/+1
|/ /
* | Revert "Merge pull request #11299 from arunagw/disable_implicit_join_referenc...Yves Senn2013-07-053-4/+11
* | Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-spaceSteve Klabnik2013-07-053-1/+34
|\ \
| * | Space is not required for Set-Cookie headerYamagishi Kazutoshi2013-07-053-1/+34
* | | Revert "remove string based terminators for `ActiveSupport::Callbacks`."Yves Senn2013-07-052-4/+6
* | | explain how to extend application templates. [ci skip]Yves Senn2013-07-051-0/+19
* | | fix typo in Active Support CHANGELOG. [ci skip]Yves Senn2013-07-051-1/+1
* | | remove string based terminators for `ActiveSupport::Callbacks`.Yves Senn2013-07-052-6/+4
* | | Merge pull request #11201 from jetthoughts/fix_create_post_example_in_getting...Yves Senn2013-07-051-13/+10
|\ \ \ | |/ / |/| |
| * | Removed params permit step from 5.6 section [ci skip]Paul Nikitochkin2013-06-301-13/+10
* | | Merge pull request #11307 from jetthoughts/cleanup_assert_sqlCarlos Antonio da Silva2013-07-041-2/+1
|\ \ \
| * | | Cleanup belongs to testsPaul Nikitochkin2013-07-051-2/+1
* | | | Merge pull request #11309 from crakalakin/AR-querying-guideCarlos Antonio da Silva2013-07-041-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | removed markdown code markers which were rendering in the generated AR queryi...Brian Foshee2013-07-041-2/+0
|/ / /
* | | Merge pull request #11303 from evsyukovmv/specify-request-method-in-guidesCarlos Antonio da Silva2013-07-042-2/+2
|\ \ \
| * | | Specify request method in guides [ci skip]Mihail Evsyukov2013-07-042-2/+2
* | | | Merge pull request #11187 from jetthoughts/form_for_explonation_in_getting_st...Steve Klabnik2013-07-041-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Added link to Form Helper article from getting strated [ci skip]Paul Nikitochkin2013-07-041-3/+3
|/ / /
* | | Merge pull request #11299 from arunagw/disable_implicit_join_references_removedCarlos Antonio da Silva2013-07-043-11/+4
|\ \ \
| * | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`.Arun Agrawal2013-07-043-11/+4
* | | | Merge pull request #11298 from raysrashmi/removed-deprecation-requireCarlos Antonio da Silva2013-07-043-3/+0
|\ \ \ \
| * | | | Removed unsued deprecation requireRashmi Yadav2013-07-043-3/+0
* | | | | Merge pull request #11300 from arunagw/railties-engine-deprecation-removedJosé Valim2013-07-043-12/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed deprecated `Rails.application.railties.engines`.Arun Agrawal2013-07-043-12/+4
| |/ / /
* | | | Merge pull request #11297 from ankit8898/masterRafael Mendonça França2013-07-041-1/+1
|\ \ \ \
| * | | | SQL Keywords to be in UPPERCASEankit88982013-07-041-1/+1
* | | | | Merge pull request #11295 from ankit8898/masterRafael Mendonça França2013-07-041-1/+1
|\| | | |
| * | | | Replaced older rocket sign to new :Ankit Gupta-FIR2013-07-041-1/+1
* | | | | Merge pull request #11261 from ryan-endacott/fixguideYves Senn2013-07-041-10/+0
|\ \ \ \ \
| * | | | | Removed redundant upgrade docs on new cookies.Ryan Endacott2013-07-041-10/+0
* | | | | | remove leftover if after deprecation removal (68563128).Yves Senn2013-07-041-4/+1
| |_|/ / / |/| | | |