Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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, 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 | 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= | Luka Marčetić | 2013-08-21 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | 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. | Ben Woosley | 2013-08-17 | 2 | -2/+2 | |
* | | | | | | | 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] | 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 | 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 | |
* | | | | | | | | 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::... | robertomiranda | 2013-08-14 | 3 | -14/+2 | |
* | | | | | | | | | Merge pull request #11443 from wangjohn/sse_reloader_class | Santiago Pastorino | 2013-08-19 | 2 | -0/+162 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | | explain how to contribute to the documentation. | Yves Senn | 2013-08-19 | 2 | -9/+7 | |
* | | | | | | | | | Merge pull request #11934 from xta/clarify_instructions_in_contributing_to_ru... | Yves Senn | 2013-08-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | clarify instructions in contributing_to_ruby_on_rails.md for committing [ci s... | Rex Feng | 2013-08-19 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add note about installing and running Memcached for Rails test suite tests th... | Pawel Janiak | 2013-08-16 | 1 | -1/+23 | |
* | | | | | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ... | Guillermo Iguaran | 2013-08-18 | 1 | -7/+7 | |
* | | | | | | | | Dont' check for any order in hash since we aren't sorting it and this is dete... | Guillermo Iguaran | 2013-08-18 | 1 | -11/+0 | |
* | | | | | | | | Merge pull request #11929 from scaryguy/master | Guillermo Iguaran | 2013-08-18 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | blorgh_engine to blorgh [ci-skip] | scaryguy | 2013-08-18 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Refactor serialization test for hash order | Guillermo Iguaran | 2013-08-18 | 1 | -7/+6 | |
* | | | | | | | | Merge pull request #11926 from Empact/respond-with-csv | José Valim | 2013-08-18 | 5 | -587/+631 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fail informatively in #respond_with when no appropriate #api_behavior rendere... | Ben Woosley | 2013-08-17 | 3 | -0/+44 | |
| * | | | | | | | | Split the 1200+ line mime_responds_test into 3 more focused and manageable te... | Ben Woosley | 2013-08-17 | 3 | -587/+587 | |
* | | | | | | | | | Merge pull request #11812 from gaurish/json-order | Guillermo Iguaran | 2013-08-17 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Avoid Skip in test, have a unified test for order | Gaurish Sharma | 2013-08-09 | 1 | -10/+7 | |
| * | | | | | | | | Add tests for ActiveModel::Serializers::JSON#as_json ordering | Gaurish Sharma | 2013-08-09 | 1 | -1/+10 | |
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 35 | -88/+131 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 39 | -115/+120 | |
| * | | | | | | | | | [getting started] Don't define resources :posts a second time + clarify messa... | Ryan Bigg | 2013-08-16 | 1 | -14/+4 | |
| * | | | | | | | | | Added new line [ci skip] | Rashmi Yadav | 2013-08-14 | 1 | -0/+1 | |
| * | | | | | | | | | Added docs for 'remove' method [ci skip] | Rashmi Yadav | 2013-08-14 | 1 | -0/+11 | |
| * | | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Thiago Pinto | 2013-08-14 | 39 | -120/+115 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Minor align BR tags with HTML void - with reference to the generators code ch... | AvnerCohen | 2013-08-07 | 2 | -2/+2 |