| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Use infinity const | Konstantin Shabanov | 2013-08-22 | 1 | -2/+2 | |
| | |/ / | ||||||
| * | | | Merge pull request #11943 from suginoy/ar-order-notation | Yves Senn | 2013-08-22 | 1 | -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 Yasuhiro | 2013-08-22 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | Merge pull request #11967 from ↵ | Rafael Mendonça França | 2013-08-22 | 3 | -4/+99 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | jetthoughts/add_action_controller_bug_report_template Added bug report template for ActionController | |||||
| | * | | | | Added bug report template for ActionController | Paul Nikitochkin | 2013-08-21 | 3 | -4/+99 | |
| | | |/ / | |/| | | | | | | | | | | [ci skip] | |||||
| * | | | | Merge pull request #11978 from edogawaconan/fix_doc_collection_proxy | Yves Senn | 2013-08-22 | 1 | -2/+0 | |
| |\ \ \ \ | |/ / / |/| | | | Stray nodoc causes rest of file not parsed [ci skip] | |||||
| | * | | | Stray nodoc causes rest of file not parsed [ci skip] | edogawaconan | 2013-08-22 | 1 | -2/+0 | |
| |/ / / | ||||||
| * | | | Merge pull request #11966 from jetthoughts/update_bug_report_templates | Rafael Mendonça França | 2013-08-21 | 2 | -2/+2 | |
| |\ \ \ | | | | | | | | | Use `Minitest::Test` instead of old `MiniTest::Unit::TestCase` for bug reports template | |||||
| | * | | | Updated bug report templates | Paul Nikitochkin | 2013-08-21 | 2 | -2/+2 | |
| |/ / / | | | | | | | | | | | | | | | | * use `Minitest::Test` instead of deprectaed `MiniTest::Unit::TestCase` [ci skip] | |||||
| * | | | Merge pull request #11932 from gaurish/skip-encoding-convertor | Rafael Mendonça França | 2013-08-21 | 2 | -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 JRuby | Gaurish Sharma | 2013-08-21 | 1 | -0/+5 | |
| | | | | | ||||||
| | * | | | Skip few of the ActiveSupport'sinflector test on JRuby | Gaurish Sharma | 2013-08-21 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | Merge pull request #11850 from razielgn/mod-delegation-backtrace | Rafael Mendonça França | 2013-08-21 | 1 | -2/+1 | |
| |\ \ \ \ | | | | | | | | | | | Generalize backtrace check on DelegationError. | |||||
| | * | | | | Rely on NoMethodError#name when deciding to raise DelegationError. | Federico Ravasio | 2013-08-12 | 1 | -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-rubinius | Rafael Mendonça França | 2013-08-21 | 2 | -0/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Skip tests involving $SAFE on Rubinius, it's not supported. | |||||
| | * | | | | | Skip tests involving $SAFE, it's not supported on Rubinius. | Federico Ravasio | 2013-08-21 | 1 | -0/+2 | |
| | | | | | | | ||||||
| | * | | | | | Added method to skip tests on Rubinius to AS/abstract_unit. | Federico Ravasio | 2013-08-21 | 1 | -0/+4 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | Merge pull request #11961 from Intrepidd/debug-exception-html | Rafael Mendonça França | 2013-08-21 | 5 | -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 rendering | Adrien Siami | 2013-08-21 | 5 | -5/+5 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #11952 from lmarcetic/master | Guillermo Iguaran | 2013-08-20 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Remove set_primary_key, replace with primary_key= | |||||
| | * | | | | Remove set_primary_key, replace with primary_key= | Luka Marčetić | 2013-08-21 | 1 | -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ça | 2013-08-20 | 1 | -6/+6 | |
| | | | | | ||||||
| * | | | | write changelog entry for #11922. [ci skip] | Yves Senn | 2013-08-20 | 1 | -0/+5 | |
| | | | | | ||||||
| * | | | | Merge pull request #11922 from Empact/string-confusion | Yves Senn | 2013-08-20 | 2 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Stop interpreting SQL 'string' columns as :string type. | |||||
| | * | | | | Stop interpreting SQL 'string' columns as :string type. | Ben Woosley | 2013-08-17 | 2 | -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 | |||||
| * | | | | | Merge pull request #11919 from prathamesh-sonpatki/doc | Rafael Mendonça França | 2013-08-19 | 1 | -1/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Change the wording to explain following methods skip callbacks [ci skip] | |||||
| | * | | | | | Change the wording to explain following methods skip callbacks [ci skip] | Prathamesh Sonpatki | 2013-08-19 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #11940 from baroquebobcat/thread_var_patch_freeze | Guillermo Iguaran | 2013-08-19 | 2 | -0/+14 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | ensure freeze on Thread freezes locals (#11831) | |||||
| | * | | | | | | ensure freeze on Thread freezes locals | Nick Howard | 2013-08-19 | 2 | -0/+14 | |
| |/ / / / / / | ||||||
| * | | | | | | Use each_with_object | Santiago Pastorino | 2013-08-19 | 1 | -4/+2 | |
| | | | | | | | ||||||
| * | | | | | | Organize normalize_encoding_params' conditionals a bit better and use a case ↵ | Santiago Pastorino | 2013-08-19 | 1 | -15/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement for it Refactor of the work done in #11891 | |||||
| * | | | | | | Merge pull request #11891 from robertomiranda/remove_upload_module | Santiago Pastorino | 2013-08-19 | 3 | -14/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Normalize file parameters in same place as other parameters (ActionDispatch::Http::Parameters#normalize_encode_params) | |||||
| | * | | | | | | Normalize file parameters in same place as other parameters ↵ | robertomiranda | 2013-08-14 | 3 | -14/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ActionDispatch::Http::Parameters#normalize_encode_params) | |||||
| * | | | | | | | Merge pull request #11443 from wangjohn/sse_reloader_class | Santiago Pastorino | 2013-08-19 | 2 | -0/+162 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | SSE class for ActionController::Live | |||||
| | * | | | | | | Creating an SSE class to be used with ActionController::Live. | wangjohn | 2013-07-30 | 2 | -0/+162 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix the indentation on the from template of the scaffold generator | Rafael Mendonça França | 2013-08-19 | 2 | -5/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | documents 565c367 in the CHANGELOG | Xavier Noria | 2013-08-19 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | let AR::FinderMethods#exists? return singletons in all cases [closes #11592] | Xavier Noria | 2013-08-19 | 2 | -34/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression. The documentation said in its introduction paragraph that the method returns truthy/falsy, but then below it was said that if there were no arguments you'd get `true` or `false`. Also when the argument is exactly `false` a singleton is documented to be returned. The method was not returning the singletons so it didn't conform to those special cases. The best solution here seems to be to just return singletons in all cases. This solution is backwards compatible. Also, the contract has been revised because it has no sense that the predicate varies that way depending on the input. I bet the previous contract was just an accident, not something mixed on purpose. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb activerecord/test/cases/finder_test.rb | |||||
| * | | | | | | | explain how to contribute to the documentation. | Yves Senn | 2013-08-19 | 2 | -9/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #11934 | |||||
| * | | | | | | | Merge pull request #11934 from ↵ | Yves Senn | 2013-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | xta/clarify_instructions_in_contributing_to_ruby_on_rails clarify instructions in contributing_to_ruby_on_rails.md for committing ... [ci skip] | |||||
| | * | | | | | | clarify instructions in contributing_to_ruby_on_rails.md for committing [ci ↵ | Rex Feng | 2013-08-19 | 1 | -1/+1 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | skip] | |||||
| * | | | | | | Fix typo [ci skip] | Carlos Antonio da Silva | 2013-08-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | oops, I missed this in 7193f75 | Guillermo Iguaran | 2013-08-18 | 1 | -1/+1 | |
| | |_|_|_|/ |/| | | | | ||||||
| * | | | | | duration is called multiple times in dev, so lets cache it | Aaron Patterson | 2013-08-18 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #11914 from pawel2105/development-dependencies-guides-fix | Guillermo Iguaran | 2013-08-18 | 1 | -1/+23 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Memcached note for Rails guides [ci skip] | |||||
| | * | | | | | Add note about installing and running Memcached for Rails test suite tests ↵ | Pawel Janiak | 2013-08-16 | 1 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | that depend on it. [ci skip] | |||||
| * | | | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ↵ | Guillermo Iguaran | 2013-08-18 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | #11831 | |||||
| * | | | | | | Dont' check for any order in hash since we aren't sorting it and this is ↵ | Guillermo Iguaran | 2013-08-18 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | determinated only by the used interpreter | |||||
| * | | | | | | Merge pull request #11929 from scaryguy/master | Guillermo Iguaran | 2013-08-18 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | blorgh_engine to blorgh | |||||
| | * | | | | | | blorgh_engine to blorgh [ci-skip] | scaryguy | 2013-08-18 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |