aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added method to skip tests on Rubinius to AS/abstract_unit.Federico Ravasio2013-08-211-0/+4
|
* 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
* | 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]
| * | 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 locals (#11831)
| * | | 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
| | | | | | | | | | | | | | | | | | statement for it Refactor of the work done in #11891
* | | Merge pull request #11891 from robertomiranda/remove_upload_moduleSantiago Pastorino2013-08-193-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 ↵robertomiranda2013-08-143-14/+2
| | | | | | | | | | | | | | | | (ActionDispatch::Http::Parameters#normalize_encode_params)
* | | | Merge pull request #11443 from wangjohn/sse_reloader_classSantiago Pastorino2013-08-192-0/+162
|\ \ \ \ | |_|/ / |/| | | SSE class for ActionController::Live
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Senn2013-08-192-9/+7
| | | | | | | | | | | | | | | | Follow-up to #11934
* | | | Merge pull request #11934 from ↵Yves Senn2013-08-191-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 Feng2013-08-191-1/+1
|/ / / / | | | | | | | | | | | | skip]
* | | | 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
|\ \ \ \ | | | | | | | | | | Memcached note for Rails guides [ci skip]
| * | | | Add note about installing and running Memcached for Rails test suite tests ↵Pawel Janiak2013-08-161-1/+23
| | | | | | | | | | | | | | | | | | | | that depend on it. [ci skip]
* | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ↵Guillermo Iguaran2013-08-181-7/+7
| | | | | | | | | | | | | | | | | | | | #11831
* | | | | Dont' check for any order in hash since we aren't sorting it and this is ↵Guillermo Iguaran2013-08-181-11/+0
| | | | | | | | | | | | | | | | | | | | determinated only by the used interpreter
* | | | | Merge pull request #11929 from scaryguy/masterGuillermo Iguaran2013-08-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | blorgh_engine to blorgh
| * | | | | 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 renderer is available.
| * | | | | Fail informatively in #respond_with when no appropriate #api_behavior ↵Ben Woosley2013-08-173-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renderer is available. Currently if a user calls #respond_with(csvable), but has not csv renderer available, Responder will just run through the default render behavior twice, raising ActionView::MissingTemplate both times. This changes ActionController::Metal::Responder#api_behavior to check in advance whether there is a renderer available, and raise ActionController::MissingRenderer if not.
| * | | | | Split the 1200+ line mime_responds_test into 3 more focused and manageable ↵Ben Woosley2013-08-173-587/+587
| | | | | | | | | | | | | | | | | | | | | | | | test files.
* | | | | | Merge pull request #11812 from gaurish/json-orderGuillermo Iguaran2013-08-171-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add tests for ActiveModel::Serializers::JSON#as_json ordering variations
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * | | | | | Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-1739-115/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
| * | | | | | [getting started] Don't define resources :posts a second time + clarify ↵Ryan Bigg2013-08-161-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | messaging around 'Showing Posts' section
| * | | | | | 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 ↵AvnerCohen2013-08-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change - https://github.com/rails/rails/commit/f038d4cc5fe1ac21f92c7e32c61ff85a0c816f3f
| | * | | | | | Revert "Removing obsolete html tags in favor of markdown code block"Avner Cohen2013-08-063-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e.
| | * | | | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 07:28:19 +0000