Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | 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 renderer is available. | ||||
| * | Fail informatively in #respond_with when no appropriate #api_behavior ↵ | Ben Woosley | 2013-08-17 | 3 | -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 Woosley | 2013-08-17 | 3 | -587/+587 |
| | | | | | | | | test files. | ||||
* | | Merge pull request #11812 from gaurish/json-order | Guillermo Iguaran | 2013-08-17 | 1 | -1/+7 |
|\ \ | |/ |/| | Add tests for ActiveModel::Serializers::JSON#as_json ordering variations | ||||
| * | 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 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 Dev | 2013-08-17 | 39 | -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 Bigg | 2013-08-16 | 1 | -14/+4 |
| | | | | | | | | | | | | messaging around 'Showing Posts' section | ||||
| * | | 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 ↵ | AvnerCohen | 2013-08-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | change - https://github.com/rails/rails/commit/f038d4cc5fe1ac21f92c7e32c61ff85a0c816f3f | ||||
| | * | | Revert "Removing obsolete html tags in favor of markdown code block" | Avner Cohen | 2013-08-06 | 3 | -52/+52 |
| | | | | | | | | | | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e. | ||||
| | * | | Removing obsolete html tags in favor of markdown code block. | Avner Cohen | 2013-08-06 | 3 | -52/+52 |
| | | | | |||||
| | * | | Added Action View in 'rake about' [ci skip] | Arun Agrawal | 2013-08-02 | 1 | -5/+6 |
| | | | | |||||
| * | | | guides should tell people to write ruby code, not output | Thiago Pinto | 2013-08-14 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #11920 from dlam/patch-1 | Santiago Pastorino | 2013-08-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed grammar error in ordered_options documention. | ||||
| * | | | | Fixed grammar error in ordered_options documention. | Dustin Lam | 2013-08-17 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #11059 from robin850/improve-test-guide | Xavier Noria | 2013-08-16 | 1 | -6/+64 |
|\ \ \ \ | | | | | | | | | | | Improve the testing guide [ci skip] | ||||
| * | | | | Improve the testing guide [ci skip] | Robin Dupret | 2013-06-25 | 1 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the "Testing Rails Applications" guide adding a section for testing helpers and a little note about associations with ActiveRecord and YAML fixtures. Also add a link to Fixture Builder ; yet another replacement for fixtures such as Machinist or FactoryGirl. | ||||
* | | | | | Merge pull request #11910 from brendon/master | Carlos Antonio da Silva | 2013-08-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use binary mode to write uploaded files [ci skip] | ||||
| * | | | | | Use binary mode to write uploaded files [ci skip] See: ↵ | Brendon Muir | 2013-08-16 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | http://stackoverflow.com/a/4988984/129798 for an explanation for why this is required for Ruby 1.9. | ||||
* | | | | | fix build error caused by #11900. | Yves Senn | 2013-08-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #11900 from onlymejosh/add_less_to_rake_todos | Yves Senn | 2013-08-15 | 3 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding LESS to rake notes | ||||
| * | | | | | Adding LESS to rake notes | Josh Crowder | 2013-08-15 | 3 | -1/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detection | José Valim | 2013-08-14 | 4 | -2/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing multi-word automatic inverse detection. | ||||
| * | | | | | Fixing multi-word automatic inverse detection. | wangjohn | 2013-08-15 | 4 | -2/+19 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Currently, ActiveRecord models with multiple words cannot have their inverse associations detected automatically. | ||||
* | | | | | Merge pull request #11887 from raysrashmi/typo_fix | Carlos Antonio da Silva | 2013-08-14 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Typo Fix[ci skip] | ||||
| * | | | | | Typo Fix[ci skip] | Rashmi Yadav | 2013-08-14 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #11574 from jetthoughts/11552_rescue_on_invalid_inet_assign | Yves Senn | 2013-08-14 | 3 | -1/+37 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix assign ip address with invalid values raise exception | ||||
| * | | | | | Rescue invalid ip address exceptions on assign. | Paul Nikitochkin | 2013-08-14 | 3 | -1/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | In order that set attribute should not be bang method | ||||
* | | | | | | Merge pull request #11886 from ↵ | Yves Senn | 2013-08-14 | 1 | -28/+28 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | jetthoughts/remove_redundant_assert_from_datatype_test Removed redundant asserts for assigns attribute operation | ||||
| * | | | | | Removed redundant asserts for assigns attribute operation | Paul Nikitochkin | 2013-08-14 | 1 | -28/+28 |
|/ / / / / | |||||
* | | | | | document `assert_not_XYZ` in place of `refute_XYZ`. | Yves Senn | 2013-08-14 | 1 | -10/+10 |
| | | | | | |||||
* | | | | | Merge pull request #11617 from swooop/doc_sanitize | Xavier Noria | 2013-08-14 | 1 | -0/+66 |
|\ \ \ \ \ | | | | | | | | | | | | | Added SanitizeHelper to rails guide docs [ci skip] | ||||
| * | | | | | Added SanitizeHelper to rails guide docs [ci skip] | Toby Sims | 2013-07-29 | 1 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SanitizeHelper to rails guide docs [ci skip] Added SanitizeHelper to rails guide docs update [ci skip] | ||||
* | | | | | | Merge pull request #11544 from prathamesh-sonpatki/namespaced_routes_test | Yves Senn | 2013-08-14 | 3 | -1/+58 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Generate namespaced routes correctly for generators. Fix for #11532 | ||||
| * | | | | | | Generate namespaced routes correctly for generators. Fix for #11532 | Prathamesh Sonpatki | 2013-08-14 | 3 | -1/+58 |
| | | | | | | | |||||
* | | | | | | | test-case for fixed issue #11870. | Yves Senn | 2013-08-14 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #11756 from zilkey/master | Yves Senn | 2013-08-13 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | added String#to_date documentation to Rails 4 upgrade guide [ci skip] | ||||
| * | | | | | | added String#to_date documentation to Rails 4 upgrade guide | Jeff Dean | 2013-08-06 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | Merge pull request #11807 from jetthoughts/11804_actions_are_public_methods | Steve Klabnik | 2013-08-13 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add description of action in Getting Started Guide [ci skip] | ||||
| * | | | | | | | #11804: Add description of action in Getting Started Guide | Paul Nikitochkin | 2013-08-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #11804 | ||||
* | | | | | | | | Merge pull request #11847 from AJ-Acevedo/master | Steve Klabnik | 2013-08-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Updated outdated initialization guide [ci skip] |