aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #11966 from jetthoughts/update_bug_report_templatesRafael Mendonça França2013-08-212-2/+2
|\ \ \ \ \ \
| * | | | | | Updated bug report templatesPaul Nikitochkin2013-08-212-2/+2
|/ / / / / /
* | | | | | Merge pull request #11932 from gaurish/skip-encoding-convertorRafael Mendonça França2013-08-212-0/+16
|\ \ \ \ \ \
| * | | | | | Define jruby_skip to skip test on JRubyGaurish Sharma2013-08-211-0/+5
| * | | | | | Skip few of the ActiveSupport'sinflector test on JRubyGaurish Sharma2013-08-211-0/+10
* | | | | | | Merge pull request #11850 from razielgn/mod-delegation-backtraceRafael Mendonça França2013-08-211-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Rely on NoMethodError#name when deciding to raise DelegationError.Federico Ravasio2013-08-121-2/+1
* | | | | | | | Merge pull request #11959 from razielgn/skip-global-safe-tests-on-rubiniusRafael Mendonça França2013-08-212-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip tests involving $SAFE, it's not supported on Rubinius.Federico Ravasio2013-08-211-0/+2
| * | | | | | | | Added method to skip tests on Rubinius to AS/abstract_unit.Federico Ravasio2013-08-211-0/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #11961 from Intrepidd/debug-exception-htmlRafael Mendonça França2013-08-215-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Escape the message of an exception in debug_exceptions to avoid bad renderingAdrien Siami2013-08-215-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #11952 from lmarcetic/masterGuillermo Iguaran2013-08-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove set_primary_key, replace with primary_key=Luka Marčetić2013-08-211-2/+2
|/ / / / / / /
* | | | | | | Fix the indentation :scissors:Rafael Mendonça França2013-08-201-6/+6
* | | | | | | write changelog entry for #11922. [ci skip]Yves Senn2013-08-201-0/+5
* | | | | | | Merge pull request #11922 from Empact/string-confusionYves Senn2013-08-202-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Stop interpreting SQL 'string' columns as :string type.Ben Woosley2013-08-172-2/+2
* | | | | | | | Merge pull request #11919 from prathamesh-sonpatki/docRafael Mendonça França2013-08-191-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | 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