aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Adding LESS to rake notesJosh Crowder2013-08-153-1/+7
|/ / / / /
* | | | | Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detectionJosé Valim2013-08-144-2/+19
|\ \ \ \ \
| * | | | | Fixing multi-word automatic inverse detection.wangjohn2013-08-154-2/+19
|/ / / / /
* | | | | Merge pull request #11887 from raysrashmi/typo_fixCarlos Antonio da Silva2013-08-141-3/+3
|\ \ \ \ \
| * | | | | Typo Fix[ci skip]Rashmi Yadav2013-08-141-3/+3
|/ / / / /
* | | | | Merge pull request #11574 from jetthoughts/11552_rescue_on_invalid_inet_assignYves Senn2013-08-143-1/+37
|\ \ \ \ \
| * | | | | Rescue invalid ip address exceptions on assign.Paul Nikitochkin2013-08-143-1/+37
* | | | | | Merge pull request #11886 from jetthoughts/remove_redundant_assert_from_datat...Yves Senn2013-08-141-28/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed redundant asserts for assigns attribute operationPaul Nikitochkin2013-08-141-28/+28
|/ / / / /
* | | | | document `assert_not_XYZ` in place of `refute_XYZ`.Yves Senn2013-08-141-10/+10
* | | | | Merge pull request #11617 from swooop/doc_sanitizeXavier Noria2013-08-141-0/+66
|\ \ \ \ \
| * | | | | Added SanitizeHelper to rails guide docs [ci skip]Toby Sims2013-07-291-0/+66
* | | | | | Merge pull request #11544 from prathamesh-sonpatki/namespaced_routes_testYves Senn2013-08-143-1/+58
|\ \ \ \ \ \
| * | | | | | Generate namespaced routes correctly for generators. Fix for #11532Prathamesh Sonpatki2013-08-143-1/+58
* | | | | | | test-case for fixed issue #11870.Yves Senn2013-08-141-0/+4
* | | | | | | Merge pull request #11756 from zilkey/masterYves Senn2013-08-131-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | added String#to_date documentation to Rails 4 upgrade guideJeff Dean2013-08-061-0/+13
* | | | | | | Merge pull request #11807 from jetthoughts/11804_actions_are_public_methodsSteve Klabnik2013-08-131-0/+4
|\ \ \ \ \ \ \
| * | | | | | | #11804: Add description of action in Getting Started GuidePaul Nikitochkin2013-08-131-0/+4
* | | | | | | | Merge pull request #11847 from AJ-Acevedo/masterSteve Klabnik2013-08-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated outdated initialization guide [ci skip]AJ Acevedo2013-08-131-1/+1
* | | | | | | | | Add String#remove(pattern) as a short-hand for the common pattern of String#g...David Heinemeier Hansson2013-08-133-0/+19
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #11868 from rajcybage/fix_refuteRafael Mendonça França2013-08-132-4/+4
|\ \ \ \ \ \ \ \