aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Change the wording to explain following methods skip callbacks [ci skip]Prathamesh Sonpatki2013-08-191-1/+3
* | | | | | Merge pull request #11940 from baroquebobcat/thread_var_patch_freezeGuillermo Iguaran2013-08-192-0/+14
|\ \ \ \ \ \
| * | | | | | ensure freeze on Thread freezes localsNick Howard2013-08-192-0/+14
|/ / / / / /
* | | | | | Use each_with_objectSantiago Pastorino2013-08-191-4/+2
* | | | | | Organize normalize_encoding_params' conditionals a bit better and use a case ...Santiago Pastorino2013-08-191-15/+18
* | | | | | Merge pull request #11891 from robertomiranda/remove_upload_moduleSantiago Pastorino2013-08-193-14/+2
|\ \ \ \ \ \
| * | | | | | Normalize file parameters in same place as other parameters (ActionDispatch::...robertomiranda2013-08-143-14/+2
* | | | | | | Merge pull request #11443 from wangjohn/sse_reloader_classSantiago Pastorino2013-08-192-0/+162
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Creating an SSE class to be used with ActionController::Live.wangjohn2013-07-302-0/+162
* | | | | | | Fix the indentation on the from template of the scaffold generatorRafael Mendonça França2013-08-192-5/+5
* | | | | | | documents 565c367 in the CHANGELOGXavier Noria2013-08-191-0/+4
* | | | | | | let AR::FinderMethods#exists? return singletons in all cases [closes #11592]Xavier Noria2013-08-192-34/+36
* | | | | | | explain how to contribute to the documentation.Yves Senn2013-08-192-9/+7
* | | | | | | Merge pull request #11934 from xta/clarify_instructions_in_contributing_to_ru...Yves Senn2013-08-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | clarify instructions in contributing_to_ruby_on_rails.md for committing [ci s...Rex Feng2013-08-191-1/+1
|/ / / / / /
* | | | | | Fix typo [ci skip]Carlos Antonio da Silva2013-08-191-1/+1
* | | | | | oops, I missed this in 7193f75Guillermo Iguaran2013-08-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | duration is called multiple times in dev, so lets cache itAaron Patterson2013-08-181-1/+2
* | | | | Merge pull request #11914 from pawel2105/development-dependencies-guides-fixGuillermo Iguaran2013-08-181-1/+23
|\ \ \ \ \
| * | | | | Add note about installing and running Memcached for Rails test suite tests th...Pawel Janiak2013-08-161-1/+23
* | | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ...Guillermo Iguaran2013-08-181-7/+7
* | | | | | Dont' check for any order in hash since we aren't sorting it and this is dete...Guillermo Iguaran2013-08-181-11/+0
* | | | | | Merge pull request #11929 from scaryguy/masterGuillermo Iguaran2013-08-181-2/+2
|\ \ \ \ \ \
| * | | | | | blorgh_engine to blorgh [ci-skip]scaryguy2013-08-181-2/+2
|/ / / / / /
* | | | | | Refactor serialization test for hash orderGuillermo Iguaran2013-08-181-7/+6
* | | | | | Merge pull request #11926 from Empact/respond-with-csvJosé Valim2013-08-185-587/+631
|\ \ \ \ \ \
| * | | | | | Fail informatively in #respond_with when no appropriate #api_behavior rendere...Ben Woosley2013-08-173-0/+44
| * | | | | | Split the 1200+ line mime_responds_test into 3 more focused and manageable te...Ben Woosley2013-08-173-587/+587
* | | | | | | Merge pull request #11812 from gaurish/json-orderGuillermo Iguaran2013-08-171-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Avoid Skip in test, have a unified test for orderGaurish Sharma2013-08-091-10/+7
| * | | | | | Add tests for ActiveModel::Serializers::JSON#as_json orderingGaurish Sharma2013-08-091-1/+10
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-1735-88/+131
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-1739-115/+120
| * | | | | | | [getting started] Don't define resources :posts a second time + clarify messa...Ryan Bigg2013-08-161-14/+4
| * | | | | | | Added new line [ci skip]Rashmi Yadav2013-08-141-0/+1
| * | | | | | | Added docs for 'remove' method [ci skip]Rashmi Yadav2013-08-141-0/+11
| * | | | | | | Merge branch 'master' of github.com:rails/docrailsThiago Pinto2013-08-1439-120/+115
| |\ \ \ \ \ \ \
| | * | | | | | | Minor align BR tags with HTML void - with reference to the generators code ch...AvnerCohen2013-08-072-2/+2
| | * | | | | | | Revert "Removing obsolete html tags in favor of markdown code block"Avner Cohen2013-08-063-52/+52
| | * | | | | | | Removing obsolete html tags in favor of markdown code block.Avner Cohen2013-08-063-52/+52
| | * | | | | | | Added Action View in 'rake about' [ci skip]Arun Agrawal2013-08-021-5/+6
| * | | | | | | | guides should tell people to write ruby code, not outputThiago Pinto2013-08-141-0/+7
* | | | | | | | | Merge pull request #11920 from dlam/patch-1Santiago Pastorino2013-08-171-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed grammar error in ordered_options documention.Dustin Lam2013-08-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #11059 from robin850/improve-test-guideXavier Noria2013-08-161-6/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve the testing guide [ci skip]Robin Dupret2013-06-251-6/+64
* | | | | | | | | Merge pull request #11910 from brendon/masterCarlos Antonio da Silva2013-08-161-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Use binary mode to write uploaded files [ci skip] See: http://stackoverflow.c...Brendon Muir2013-08-161-1/+1
|/ / / / / / / /
* | | | | | | | fix build error caused by #11900.Yves Senn2013-08-151-1/+1
* | | | | | | | Merge pull request #11900 from onlymejosh/add_less_to_rake_todosYves Senn2013-08-153-1/+7
|\ \ \ \ \ \ \ \