aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move rendering from AP to AVŁukasz Strzałkowski2013-08-257-613/+189
* Require only path_set && lookup_context instead of whole baseŁukasz Strzałkowski2013-08-251-1/+2
* Move view_paths from AP to AVŁukasz Strzałkowski2013-08-256-2/+2
* Merge pull request #12008 from wangjohn/skipping_deprecated_migration_testsSantiago Pastorino2013-08-241-7/+21
|\
| * Adding deprecation assertions for proper_table_name.wangjohn2013-08-241-7/+21
|/
* Merge pull request #12000 from wangjohn/deprecating_class_name_string_in_fixt...Santiago Pastorino2013-08-231-7/+1
|\
| * Deprecating passing strings as class name in fixtures.wangjohn2013-08-231-7/+1
* | Merge pull request #11984 from wangjohn/proper_table_nameSantiago Pastorino2013-08-232-19/+68
|\ \
| * | Making proper_table_name take in options.wangjohn2013-08-222-19/+68
* | | typo [ci skip]Xavier Noria2013-08-231-1/+1
* | | Merge pull request #11960 from kirs/xhr-errorsRafael Mendonça França2013-08-2315-13/+129
|\ \ \ | |_|/ |/| |
| * | Display exceptions in text format for xhr requestKir Shatrov2013-08-2215-13/+129
* | | cleans the guides sources from fancy non-ASCII stuffXavier Noria2013-08-2321-96/+96
* | | Merge pull request #11996 from semaperepelitsa/masterYves Senn2013-08-231-1/+1
|\ \ \
| * | | Fix typo in file path, should include extension.Semyon Perepelitsa2013-08-231-1/+1
|/ / /
* | | Merge pull request #11994 from rajcybage/fix_instanceCarlos Antonio da Silva2013-08-231-2/+1
|\ \ \
| * | | remove unused instance variableRajarshi Das2013-08-231-2/+1
* | | | Merge pull request #11991 from prathamesh-sonpatki/note-edge-guidesYves Senn2013-08-231-2/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add a note about edge guides in the feedback section[ci skip]Prathamesh Sonpatki2013-08-231-2/+4
|/ / /
* | | Merge pull request #11971 from freerunningtechnologies/dynamic_respond_toAaron Patterson2013-08-222-1/+6
|\ \ \ | |_|/ |/| |
| * | Avoid compiling regexs in AR::Base.respond_to?John Hawthorn2013-08-212-1/+6
* | | Merge pull request #11976 from etehtsea/infYves Senn2013-08-221-2/+2
|\ \ \
| * | | Use infinity constKonstantin Shabanov2013-08-221-2/+2
| |/ /
* | | Merge pull request #11943 from suginoy/ar-order-notationYves Senn2013-08-221-0/+10
|\ \ \
| * | | Add examples of AR order method's hash notation to Rails Guide [ci skip]Sugino Yasuhiro2013-08-221-0/+10
* | | | Merge pull request #11967 from jetthoughts/add_action_controller_bug_report_t...Rafael Mendonça França2013-08-223-4/+99
|\ \ \ \
| * | | | Added bug report template for ActionControllerPaul Nikitochkin2013-08-213-4/+99
| | |/ / | |/| |
* | | | Merge pull request #11978 from edogawaconan/fix_doc_collection_proxyYves Senn2013-08-221-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Stray nodoc causes rest of file not parsed [ci skip]edogawaconan2013-08-221-2/+0
|/ / /
* | | 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
|\ \ \ \ \ \