aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-313-11/+17
|\
| * Fix typos [ci skip]Carlos Antonio da Silva2013-08-301-2/+2
| |
| * Add documentation for rake db:setup taskJay Hayes2013-08-291-0/+5
| |
| * Note functional equivalence in reset taskJay Hayes2013-08-291-2/+2
| |
| * Document ability to run a single test.wangjohn2013-08-211-1/+8
| |
| * Removing merge conflict remnants in the guides.wangjohn2013-08-211-6/+0
| |
| * Moved "`mod_expires` to be enabled" to new line.Prathamesh Sonpatki2013-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | - Right now the comment was not rendering properly. # The Expires* directives requires the Apache module `mod_expires` to be # enabled. - After this change - # The Expires* directives requires the Apache module # `mod_expires` to be enabled.
* | Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-292-2/+2
| | | | | | | | | | | | and activerecord tests [ci skip]
* | Merge pull request #12033 from alexaltair/patch-1Yves Senn2013-08-271-1/+1
|\ \ | | | | | | change reference of `Test::Unit` to `Minitest` [ci skip]
| * | Update Test::Unit to MinitestAlex Altair2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | Previous was misleading; current is more up to date. [ci skip]
* | | Merge pull request #11805 from ↵Rafael Mendonça França2013-08-271-34/+36
|\ \ \ | | | | | | | | | | | | | | | | jetthoughts/11803_update_move_forbidden_exception_description_before_show [Getting Started Guide] Move Forbidden attributes description before show post section [ci skip]
| * | | #11803: Move Forbidden attributes description before show post sectionPaul Nikitochkin2013-08-271-34/+36
| |/ / | | | | | | | | | [ci skip]
* / / adding more finder migration information to upgrade guide [ci skip]Gary S. Weaver2013-08-271-0/+6
|/ /
* | Merge pull request #12032 from carolinemota/fixdocCarlos Antonio da Silva2013-08-261-19/+3
|\ \ | | | | | | Remove whiny_nils config from the rails guides [ci skip]
| * | Remove whiny_nils config from the rails guidesCaroline Mota2013-08-261-19/+3
| | | | | | | | | | | | | | | | | | This option was removed from master. [ci skip]
* | | Merge pull request #11986 from fedesoria/patch-3Xavier Noria2013-08-261-0/+5
|\ \ \ | |/ / |/| | Warning on doc for assets under lib|vendor not precompiling
| * | Warning on doc for assets under lib|vendor not precompilingFederico Soria2013-08-261-0/+5
| | |
* | | Add note about features vs. bugs.Steve Klabnik2013-08-261-3/+22
| | | | | | | | | | | | | | | Sometimes people ask what makes a feature and what makes a bug, so let's clarify that so we can show it to people later.
* | | Flesh out feedback portion of contributing guide.Steve Klabnik2013-08-261-1/+18
| | | | | | | | | | | | | | | I don't know of anyone that hangs out in #rails-contrib, and we should also let people know that feedback can take some time.
* | | Soften wording about knowing other devs.Steve Klabnik2013-08-261-1/+7
| | | | | | | | | | | | | | | Many people don't, so point them to a place where they can meet some.
* | | Merge pull request #12015 from vipulnsward/add_dynamic_finders_to_upgradeSteve Klabnik2013-08-261-0/+12
|\ \ \ | | | | | | | | Add Finder API changes to upgrading guide [ci skip]
| * | | Add Finder API changes to upgrading guide [skip ci]Vipul A M2013-08-261-0/+12
| | | |
* | | | fix typo in the credit section of the guides. [ci skip]Yves Senn2013-08-261-1/+1
| | | |
* | | | Merge pull request #11997 from startupjockey/add_credits_ASYves Senn2013-08-262-0/+4
|\ \ \ \ | | | | | | | | | | Adds Akshay Surve to Rails Guides credits list [ci skip]
| * | | | Adds Akshay Surve to Rails Guides credits listAkshay Surve2013-08-232-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had written the original guide for "A Guide to Testing Rails Applications". The current documents maintains the same structure and examples I had drafted albeit with some minor changes to keep up with newer version of Rails. Older version which had credits included: http://guides.rubyonrails.org/v2.3.11/testing.html Github lifo/docrails History: https://github.com/rails/rails/commits/ff359af86505b4d317b7467e7f79aa2ef2c5e795/railties/doc/guides/source/testing_rails_applications.txt
* | | | | Merge pull request #11973 from prathamesh-sonpatki/nokogiri-warningYves Senn2013-08-261-0/+19
|\ \ \ \ \ | | | | | | | | | | | | Add error message for including nokogiri in Gemfile for rake doc:guides
| * | | | | Add error message for including nokogiri in Gemfile for rake doc:guides [ci ↵Prathamesh Sonpatki2013-08-221-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] - When `rake doc:guides` is run from applications, it complains for presence of redcarpet if it not present in Gemfile - Similarly it should complain about nokogiri
* | | | | | Removing instances of string class_names in fixtures.wangjohn2013-08-241-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, constantizing the default_fixture_model_name when it gets loaded in from the file. Later, when the class_name is passed to a new FixtureSet, a deprecation warning will occur if the class_name is a string.
* | | | | typo [ci skip]Xavier Noria2013-08-231-1/+1
| | | | |
* | | | | cleans the guides sources from fancy non-ASCII stuffXavier Noria2013-08-2321-96/+96
| |/ / / |/| | |
* | | | Add a note about edge guides in the feedback section[ci skip]Prathamesh Sonpatki2013-08-231-2/+4
| |/ / |/| |
* | | Merge pull request #11943 from suginoy/ar-order-notationYves Senn2013-08-221-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 Yasuhiro2013-08-221-0/+10
| | | |
* | | | Added bug report template for ActionControllerPaul Nikitochkin2013-08-213-4/+99
| |/ / |/| | | | | | | | [ci skip]
* | | Updated bug report templatesPaul Nikitochkin2013-08-212-2/+2
| | | | | | | | | | | | | | | | | | * use `Minitest::Test` instead of deprectaed `MiniTest::Unit::TestCase` [ci skip]
* | | 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
* | | Change the wording to explain following methods skip callbacks [ci skip]Prathamesh Sonpatki2013-08-191-1/+3
| | |
* | | explain how to contribute to the documentation.Yves Senn2013-08-192-9/+7
| | | | | | | | | | | | Follow-up to #11934
* | | 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
| |
* | 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]
* | | blorgh_engine to blorgh [ci-skip]scaryguy2013-08-181-2/+2
| |/ |/|
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-176-26/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-178-52/+62
| | | | | | | | | | | | | | | | | | | | | 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-148-62/+52
| |\ \
| | * | 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