aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs"Rafael Mendonça França2016-02-011-102/+0
| | | | | | | This reverts commit 96355e87cba247246234386b0af9273cc5d59db9, reversing changes made to a00c36feea6c0271b5ad48a949ef294514fdef52. See https://github.com/rails/rails/pull/23366#issuecomment-177714429
* Merge pull request #22857 from bdewater/interlock-docVipul A M2016-02-014-8/+9
|\ | | | | Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]
| * Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]Bart de Water2016-01-314-9/+10
| |
* | Merge pull request #23368 from ↵Santiago Pastorino2016-01-311-3/+0
|\ \ | | | | | | | | | | | | y-yagi/remove_backward_compatibility_code_for_minitest_4 remove backward compatibility code for Minitest 4
| * | remove backward compatibility code for Minitest 4yuuji.yaginuma2016-01-301-3/+0
| | | | | | | | | | | | | | | The master branch is required Ruby 2.2.2+, for the Ruby 2.2 is bundled Minitest 5.4.3, I think backward compatibility code for Minitest 4 is unnecessary.
* | | Remove odd ` [ci skip]Ryuta Kamizono2016-01-311-1/+1
| | |
* | | Add configuration section to "Active Record Basics" guideJon Moss2016-01-301-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fill in some missing information as apart of #22931. It's on purpose that the sample `Message` model inherits from `ActiveRecord::Base` -- Active Record is not meant to be coupled to Rails, and we can't guarantee that users outside of the Rails world will have an `ApplicationRecord` class that inherits from `ActiveRecord::Base`. [ci skip]
* | | Small cleanup to Testing GuideJon Moss2016-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | - inbuilt --> built-in - Remove random spaces from code examples [ci skip]
* | | Merge pull request #23358 from vipulnsward/testing-guide-pass-3Vipul A M2016-01-311-19/+28
|\ \ \ | | | | | | | | Pass 3 over testing guide
| * | | Pass 3 over testing guideVipul A M2016-01-311-19/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Various grammar fixes - Added assertions for update controller action tests - Added user helper tests - Fix typos [ci skip]
* / / typo fix [ci skip] Prayag Verma2016-01-311-1/+1
|/ / | | | | Spelling mistake - direcotry > directory
* | Getting Started Guide: Update Ruby version to 2.3.0p0Francis Go2016-01-291-1/+1
| |
* | Docs review of api_app.mdJon Moss2016-01-281-16/+19
| | | | | | | | | | | | | | | | Pass through correcting api_app.md. The list of included modules and middleware was tested through a sample API app, and was listed in the same order an end user would see in their terminal. [ci skip]
* | Remove Rack::Lock from the API guidesRafael Mendonça França2016-01-281-4/+0
| | | | | | | | | | | | It is not always there anymore [ci skip]
* | Middleware have no pluralRafael Mendonça França2016-01-281-14/+14
| | | | | | | | [ci skip]
* | Mark API guide as work in progressRafael Mendonça França2016-01-281-0/+1
| | | | | | | | The documentation team didn't reviewed it yet so it can't be published.
* | Put "Using Rails for API-only Applications" in table of contentsPiotr Jakubowski2016-01-281-0/+4
| | | | | | | | | | | | | | | | When I was looking for more info regarding this the only way I ended up on that page was by googling something along the lines of "rails new api" (as I wanted to find out what are the proper parameters when generating api app). I think it's beneficial to have that page in table of contents.
* | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-281-0/+0
|\ \ | | | | | | Introduce new welcome page for new projects
| * | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-261-0/+0
| | | | | | | | | | | | As requested by David in 23233.
* | | English explanation to multi-level nested joinCollin Graves2016-01-271-0/+2
| | | | | | | | | Added an "Or, in English..." explanation to the "Joining Nested Associations (Multiple Level)" example.
* | | Fix typos in asset_pipeline.mdDjoume Salvetti2016-01-271-3/+3
| | |
* | | remove duplication section [ci skip]Aditya Kapoor2016-01-271-4/+0
|/ /
* | Merge pull request #23208 from vipulnsward/testing-pass-2Jon Moss2016-01-251-14/+14
|\ \ | | | | | | Pass 2 over testing guide
| * | Pass 2 over testing guideVipul A M2016-01-231-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar fixes - Wordsmitting - Fixed wrong statement about association usage in fixtures - Changed association name from 'one' to 'first' instead - More consistent usage of we/our - Mentions assert_select is below, not already covered in Integration test. [ci skip]
* | | Merge pull request #23210 from sachin21/change_permissionYves Senn2016-01-251-0/+0
|\ \ \ | | | | | | | | Change permission to readonly [ci skip]
| * | | Change permission to readonlySatoshi Ohmori2016-01-231-0/+0
| |/ / | | | | | | | | | | | | | | | changed from 755 to 644. I executed `chmod -x guides/assets/javascripts/responsive-tables.js`. [ci skip]
* / / Update the exception of format constraint in routesFernando Seror2016-01-231-0/+2
|/ / | | | | | | | | Per https://github.com/rails/rails/issues/20264 [ci skip]
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-01-221-1/+1
|\ \
| * | [ci skip] An internal link is an relative pathyui-knk2015-12-231-1/+1
| | |
* | | Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ↵Gaurav Sharma2016-01-221-43/+62
| | | | | | | | | | | | use bin/rails instead of rake [ci skip]
* | | Merge pull request #23177 from vipulnsward/testing-pass-1Jon Moss2016-01-221-7/+7
|\ \ \ | | | | | | | | First pass over parts of Testing guide
| * | | First pass over parts of Testing guideVipul A M2016-01-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar improvements - Consistent usage of you or we in sentences - Tests can have zero or more assertions. Its not mandatory to have one. - Example for assert_send [ci skip]
* | | | [ci skip] fix #23157Shakib Hossain2016-01-221-0/+5
|/ / /
* | | insert newlines into code samplesAlexander2016-01-201-3/+5
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #23125 from Gaurav2728/update_puma_as_webserverRafael França2016-01-194-17/+14
|\ \ \ | | | | | | | | [ci skip] update guide for Puma web server instead of Webrick
| * | | [ci skip] update guide for Puma web server instead of WebrickGaurav Sharma2016-01-204-17/+14
| | | | | | | | | | | | Rails 5.0 default server puma web server. following commit - https://github.com/rails/rails/commit/ae48ea69
* | | | - Changed from bin/rake to bin/rails at more application places.Vipul A M2016-01-203-5/+5
|/ / / | | | | | | | | | | | | | | | | | | - Only ones left are from the upgrading guide, and command line guide explicit section about rake Follow up of https://github.com/rails/rails/pull/23119 [ci skip]
* | | use bin/rails default instead of rake commands [ci skip]Gaurav Sharma2016-01-196-37/+37
| | | | | | | | | I go through the `http://edgeguides.rubyonrails.org/` and found `rake` commands in various files that are in RAILS 5.0 implement by `bin/rails` command. I try to change all that can be directly use `bin/rails …`
* | | - Remove dead links and take users to just the home page insteadVipul A M2016-01-192-14/+1
| | | | | | | | | | | | | | | - Add new logo for guides header [ci skip]
* | | Merge pull request #23117 from vipulnsward/22297-ar-exception-raiseAbdelkader Boudih2016-01-191-1/+1
|\ \ \ | | | | | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordIn…
| * | | Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` ↵Vipul A M2016-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception as well, similar to `ActiveRecord::Rollback` Fixes #22297 [ci skip]
* | | | Make text about render :html option clearer to state, text will get escaped ↵Vipul A M2016-01-191-1/+1
|/ / / | | | | | | | | | | | | | | | | | | if not marked as safe by using html_safe Fixes #22648 [ci skip]
* | | Fix discrepancies in associations guide [ci skip]Prathamesh Sonpatki2016-01-191-6/+6
| | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/71ff088a09d429657877ddfb58985d30df63fc8a
* | | `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides ↵amitkumarsuroliya2016-01-191-2/+2
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #23099 from vipulnsward/change_start_at_end_atKasper Timm Hansen2016-01-181-10/+10
|\ \ \ | | | | | | | | Changed options for find_each and variants to have options start/finish
| * | | Changed options for find_each and variants to have options start/finish ↵Vipul A M2016-01-181-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | instead of start_at/end_at based on comments at https://github.com/rails/rails/pull/12257#issuecomment-74688344
* | | | Association Guide replaces Order as example with Author-Book Example [ci skip]amitkumarsuroliya2016-01-183-230/+230
| | | | | | | | | | | | fixes #21500
* | | | Merge pull request #22705 from ↵Jon Moss2016-01-181-2/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | RochesterinNYC/add-order-explanation-to-first-last-guides Add clarification about `first` and `last` behavior when using `order` [ci skip]
| * | | | Add clarification about `first` and `last` behavior when using `order` [ci skip]James Wen2015-12-201-2/+28
| | |/ / | |/| |
* | | | Merge pull request #22394 from j-dexx/update_association_basics_guideJon Moss2016-01-181-3/+13
|\ \ \ \ | | | | | | | | | | Updated the guides for having a distinct has_many through at the data…