aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add examples of AR order method's hash notation to Rails Guide [ci skip]Sugino Yasuhiro2013-08-221-0/+10
|
* 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
| | | | |
* | | | | Merge pull request #11920 from dlam/patch-1Santiago Pastorino2013-08-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed grammar error in ordered_options documention.
| * | | | | Fixed grammar error in ordered_options documention.Dustin Lam2013-08-171-1/+1
|/ / / / /
* | | | | Merge pull request #11059 from robin850/improve-test-guideXavier Noria2013-08-161-6/+64
|\ \ \ \ \ | | | | | | | | | | | | Improve the testing guide [ci skip]
| * | | | | Improve the testing guide [ci skip]Robin Dupret2013-06-251-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/masterCarlos Antonio da Silva2013-08-161-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Use binary mode to write uploaded files [ci skip]
| * | | | | Use binary mode to write uploaded files [ci skip] See: ↵Brendon Muir2013-08-161-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 Senn2013-08-151-1/+1
| | | | |
* | | | | Merge pull request #11900 from onlymejosh/add_less_to_rake_todosYves Senn2013-08-153-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Adding LESS to rake notes
| * | | | | Adding LESS to rake notesJosh Crowder2013-08-153-1/+7
|/ / / / /
* | | | | Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detectionJosé Valim2013-08-144-2/+19
|\ \ \ \ \ | | | | | | | | | | | | Fixing multi-word automatic inverse detection.
| * | | | | Fixing multi-word automatic inverse detection.wangjohn2013-08-154-2/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | Currently, ActiveRecord models with multiple words cannot have their inverse associations detected automatically.
* | | | | Merge pull request #11887 from raysrashmi/typo_fixCarlos Antonio da Silva2013-08-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Typo Fix[ci skip]
| * | | | | Typo Fix[ci skip]Rashmi Yadav2013-08-141-3/+3
|/ / / / /
* | | | | Merge pull request #11574 from jetthoughts/11552_rescue_on_invalid_inet_assignYves Senn2013-08-143-1/+37
|\ \ \ \ \ | | | | | | | | | | | | Fix assign ip address with invalid values raise exception
| * | | | | Rescue invalid ip address exceptions on assign.Paul Nikitochkin2013-08-143-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | In order that set attribute should not be bang method
* | | | | | Merge pull request #11886 from ↵Yves Senn2013-08-141-28/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | jetthoughts/remove_redundant_assert_from_datatype_test Removed redundant asserts for assigns attribute operation
| * | | | | Removed redundant asserts for assigns attribute operationPaul Nikitochkin2013-08-141-28/+28
|/ / / / /
* | | | | document `assert_not_XYZ` in place of `refute_XYZ`.Yves Senn2013-08-141-10/+10
| | | | |
* | | | | Merge pull request #11617 from swooop/doc_sanitizeXavier Noria2013-08-141-0/+66
|\ \ \ \ \ | | | | | | | | | | | | Added SanitizeHelper to rails guide docs [ci skip]
| * | | | | Added SanitizeHelper to rails guide docs [ci skip]Toby Sims2013-07-291-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_testYves Senn2013-08-143-1/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | Generate namespaced routes correctly for generators. Fix for #11532
| * | | | | | Generate namespaced routes correctly for generators. Fix for #11532Prathamesh Sonpatki2013-08-143-1/+58
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 19:18:45 +0000