aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Hook up AV::Rendering on AV intializationŁukasz Strzałkowski2013-08-253-3/+7
|
* Move layouts to AVŁukasz Strzałkowski2013-08-255-2/+432
|
* Add loading 'action_view' as part of rails/allŁukasz Strzałkowski2013-08-251-0/+1
|
* 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
|\ | | | | Skip tests using deprecated +proper_table_name+ method.
| * Adding deprecation assertions for proper_table_name.wangjohn2013-08-241-7/+21
|/ | | | This prevents deprecation warnings from popping up.
* Merge pull request #12000 from ↵Santiago Pastorino2013-08-231-7/+1
|\ | | | | | | | | wangjohn/deprecating_class_name_string_in_fixtures Deprecating passing strings as class name in fixtures.
| * 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.
| * | Making proper_table_name take in options.wangjohn2013-08-222-19/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The options will specify the prefix and the suffix. Also, I'm moving the method to be an instance method on the +Migration+ instance. This makes more sense than being a class method on the +Migrator+ class because the only place that uses it is on a +Migration+ instance (in a method_missing hook). The logic for the Migrator shouldn't be doing any work to calculate the table name, it should be the Migration itself. Also made some small indentation fixes.
* | | 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
|\ \ \ | |_|/ |/| | Show exceptions in text format for xhr requests
| * | 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
|\ \ \ | | | | | | | | Docs: fix typo in file path, should include extension. [ci skip]
| * | | 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 not used instance variable
| * | | 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]
| * | | 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
|\ \ \ | |_|/ |/| | Performance regression in AR::Base.respond_to?
| * | Avoid compiling regexs in AR::Base.respond_to?John Hawthorn2013-08-212-1/+6
| | | | | | | | | | | | | | | Caches the patterns of ActiveRecord::DynamicMatchers in a class instance variable.
* | | Merge pull request #11976 from etehtsea/infYves Senn2013-08-221-2/+2
|\ \ \ | | | | | | | | [PG adapter] Use infinity const
| * | | 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]
| * | | 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 ↵Rafael Mendonça França2013-08-223-4/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jetthoughts/add_action_controller_bug_report_template Added bug report template for ActionController
| * | | | Added bug report template for ActionControllerPaul Nikitochkin2013-08-213-4/+99
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | 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]
| * | | 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
|\ \ \ | | | | | | | | Use `Minitest::Test` instead of old `MiniTest::Unit::TestCase` for bug reports template
| * | | Updated bug report templatesPaul Nikitochkin2013-08-212-2/+2
|/ / / | | | | | | | | | | | | | | | * use `Minitest::Test` instead of deprectaed `MiniTest::Unit::TestCase` [ci skip]
* | | Merge pull request #11932 from gaurish/skip-encoding-convertorRafael Mendonça França2013-08-212-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [JRuby] Skip few of the ActiveSupport's inflector test cases Conflicts: activesupport/test/abstract_unit.rb
| * | | 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
|\ \ \ \ | | | | | | | | | | Generalize backtrace check on DelegationError.
| * | | | Rely on NoMethodError#name when deciding to raise DelegationError.Federico Ravasio2013-08-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different Ruby implementations present backtraces differently, as it should be an information consumed by humans. A better implementation should use data from the error, in this case returned by NoMethodError#name. Fixes issues with Rubinius, which presents backtraces differently from MRI.
* | | | | Merge pull request #11959 from razielgn/skip-global-safe-tests-on-rubiniusRafael Mendonça França2013-08-212-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Skip tests involving $SAFE on Rubinius, it's not supported.
| * | | | | 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 rendering
| * | | | 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=
| * | | | Remove set_primary_key, replace with primary_key=Luka Marčetić2013-08-211-2/+2
|/ / / / | | | | | | | | First deprecated, now removed: https://github.com/rails/rails/commit/9add7608f1acaa68b025470e7a38901d7e6161ca#activerecord/lib/active_record/attribute_methods/primary_key.rb
* | | | 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.
| * | | | Stop interpreting SQL 'string' columns as :string type.Ben Woosley2013-08-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL doesn't have a string type, and interpreting 'string' as text is contrary to at least SQLite3's behavior: "Note that a declared type of 'STRING' has an affinity of NUMERIC, not TEXT." http://www.sqlite.org/datatype3.html