Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update doc with appropriate issue and pull request versions | Ryan Manuel | 2016-01-28 | 1 | -1/+1 |
| | |||||
* | Add an after_bundle callback in Rails plugin templates | Ryan Manuel | 2016-01-28 | 1 | -0/+3 |
| | |||||
* | Merge pull request #23237 from gsamokovarov/new-welcome-page | David Heinemeier Hansson | 2016-01-28 | 1 | -0/+0 |
|\ | | | | | Introduce new welcome page for new projects | ||||
| * | Introduce new welcome page for new projects | Genadi Samokovarov | 2016-01-26 | 1 | -0/+0 |
| | | | | | | | | As requested by David in 23233. | ||||
* | | English explanation to multi-level nested join | Collin Graves | 2016-01-27 | 1 | -0/+2 |
| | | | | | | Added an "Or, in English..." explanation to the "Joining Nested Associations (Multiple Level)" example. | ||||
* | | Fix typos in asset_pipeline.md | Djoume Salvetti | 2016-01-27 | 1 | -3/+3 |
| | | |||||
* | | remove duplication section [ci skip] | Aditya Kapoor | 2016-01-27 | 1 | -4/+0 |
|/ | |||||
* | Merge pull request #23208 from vipulnsward/testing-pass-2 | Jon Moss | 2016-01-25 | 1 | -14/+14 |
|\ | | | | | Pass 2 over testing guide | ||||
| * | Pass 2 over testing guide | Vipul A M | 2016-01-23 | 1 | -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_permission | Yves Senn | 2016-01-25 | 1 | -0/+0 |
|\ \ | | | | | | | Change permission to readonly [ci skip] | ||||
| * | | Change permission to readonly | Satoshi Ohmori | 2016-01-23 | 1 | -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 routes | Fernando Seror | 2016-01-23 | 1 | -0/+2 |
|/ | | | | | Per https://github.com/rails/rails/issues/20264 [ci skip] | ||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-01-22 | 1 | -1/+1 |
|\ | |||||
| * | [ci skip] An internal link is an relative path | yui-knk | 2015-12-23 | 1 | -1/+1 |
| | | |||||
* | | Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ↵ | Gaurav Sharma | 2016-01-22 | 1 | -43/+62 |
| | | | | | | | | use bin/rails instead of rake [ci skip] | ||||
* | | Merge pull request #23177 from vipulnsward/testing-pass-1 | Jon Moss | 2016-01-22 | 1 | -7/+7 |
|\ \ | | | | | | | First pass over parts of Testing guide | ||||
| * | | First pass over parts of Testing guide | Vipul A M | 2016-01-22 | 1 | -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 #23157 | Shakib Hossain | 2016-01-22 | 1 | -0/+5 |
|/ / | |||||
* | | insert newlines into code samples | Alexander | 2016-01-20 | 1 | -3/+5 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #23125 from Gaurav2728/update_puma_as_webserver | Rafael França | 2016-01-19 | 4 | -17/+14 |
|\ \ | | | | | | | [ci skip] update guide for Puma web server instead of Webrick | ||||
| * | | [ci skip] update guide for Puma web server instead of Webrick | Gaurav Sharma | 2016-01-20 | 4 | -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 M | 2016-01-20 | 3 | -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 Sharma | 2016-01-19 | 6 | -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 instead | Vipul A M | 2016-01-19 | 2 | -14/+1 |
| | | | | | | | | | | - Add new logo for guides header [ci skip] | ||||
* | | Merge pull request #23117 from vipulnsward/22297-ar-exception-raise | Abdelkader Boudih | 2016-01-19 | 1 | -1/+1 |
|\ \ | | | | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordIn… | ||||
| * | | Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` ↵ | Vipul A M | 2016-01-19 | 1 | -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 M | 2016-01-19 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | if not marked as safe by using html_safe Fixes #22648 [ci skip] | ||||
* | | Fix discrepancies in associations guide [ci skip] | Prathamesh Sonpatki | 2016-01-19 | 1 | -6/+6 |
| | | | | | | | | - Followup of https://github.com/rails/rails/commit/71ff088a09d429657877ddfb58985d30df63fc8a | ||||
* | | `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides ↵ | amitkumarsuroliya | 2016-01-19 | 1 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #23099 from vipulnsward/change_start_at_end_at | Kasper Timm Hansen | 2016-01-18 | 1 | -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 M | 2016-01-18 | 1 | -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] | amitkumarsuroliya | 2016-01-18 | 3 | -230/+230 |
| | | | | | | | | | fixes #21500 | ||||
* | | | Merge pull request #22705 from ↵ | Jon Moss | 2016-01-18 | 1 | -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 Wen | 2015-12-20 | 1 | -2/+28 |
| | |/ | |/| | |||||
* | | | Merge pull request #22394 from j-dexx/update_association_basics_guide | Jon Moss | 2016-01-18 | 1 | -3/+13 |
|\ \ \ | | | | | | | | | Updated the guides for having a distinct has_many through at the data… | ||||
| * | | | Updated the guides for having a distinct has_many through at the database level | James Doyley | 2016-01-18 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current example add_index :person_articles, :article, unique: true Does not work, the `:article` column does not exist as it will be a join table (based on the prior example) so should use :article_id The documentation seems to suggest that it will allow an article to be added only once to a person via the join table, what actually occurs is that it only allows the article to be added to one person, at which point it should be a `belongs_to` association. Also changed the new example to use readings based on the prior example | ||||
* | | | | Explain how HStore columns can be queried [ci skip] | Prathamesh Sonpatki | 2016-01-18 | 1 | -0/+4 |
| |_|/ |/| | | | | | | | | - Fixes #22876. | ||||
* | | | [ci skip] fix typo in docs | ankit1910 | 2016-01-14 | 1 | -1/+1 |
| | | | |||||
* | | | Add a note on ActionController guide about 404 | Mauro George | 2016-01-11 | 1 | -2/+6 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #22983 from bronson/update-mysql-in-guides | Santiago Pastorino | 2016-01-10 | 2 | -2/+1 |
|\ \ \ | | | | | | | | | remove mentions of legacy mysql adapter from guides | ||||
| * | | | remove legacy mysql from guides to match #22715 | Scott Bronson | 2016-01-09 | 2 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #21995 from tak1n/master | Jon Moss | 2016-01-10 | 1 | -8/+35 |
|\ \ \ \ | | | | | | | | | | | Add Example for using config_for | ||||
| * | | | | fix doc for rails custom configuration through config_for [skip ci] | Benny Klotz | 2015-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Updated existing custom configuration for rails 5 where `config.x` | Benny Klotz | 2015-10-19 | 1 | -8/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace is not needed anymore. Added custom configuration through config_for which parses a yml file in config folder. | ||||
* | | | | | rake log:clear task updated refs[#22544] | Pramod | 2016-01-09 | 1 | -1/+1 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoided truncating all files if no ENV['LOGS'] specified - Updated task to accept LOGS=all for truncating all files from log/ i.e. log/*log - If no LOGS specified will truncates standard environment log files i.e. 'development,test,production' - CHANGELOG & guide update added - bin/setup test cases fixed | ||||
* | | | | Merge pull request #22275 from mastahyeti/per-form-csrf | Rafael França | 2016-01-06 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Per-form CSRF tokens | ||||
| * | | | | add option for per-form CSRF tokens | Ben Toews | 2016-01-04 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #22922 from vhf/add_fpb_back | Claudio B | 2016-01-05 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Update doc/resource link removed by #21211 | ||||
| * | | | | | [ci skip] Update doc/resource link removed by #21211 | Victor Felder | 2016-01-05 | 1 | -0/+1 |
| |/ / / / | |||||
* / / / / | Add job suffix to sample's job file name | Manu | 2016-01-05 | 1 | -2/+2 |
|/ / / / |