Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add #24385 to 5.0 release notes [ci skip] | yuuji.yaginuma | 2016-04-29 | 1 | -0/+7 |
| | |||||
* | rm unused require | Vipul A M | 2016-04-29 | 1 | -1/+0 |
| | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | Extract `add_sql_comment!` method | Ryuta Kamizono | 2016-04-29 | 3 | -20/+13 |
| | | | | | | Refactor of #22911. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | Treat blank comments as no comment for indexes | Ryuta Kamizono | 2016-04-29 | 3 | -6/+11 |
| | | | | | | Follow up of 1683410. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | Migrations: move version-finding responsibility | yui-knk | 2016-04-29 | 2 | -7/+11 |
| | | | | | | | `ActiveRecord::Migration` needn't know about migration version compatibility lookup. Delegate it to the Compatibility module. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | restores the regexp used in String#blank? | Xavier Noria | 2016-04-29 | 1 | -4/+3 |
| | | | | | | | | | | This commit undoes 54243fe. Reason: Further investigation has shown the benefit is not so clear generally speaking. There is a long discussion and several benchmarks in the PR #24658 if you are interested in the details. | ||||
* | Chomp: prefer String#chomp where we can for a clarity boost | lvl0nax | 2016-04-29 | 3 | -7/+5 |
| | | | | | | Closes #24766, #24767 Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | AS::Duration changelog polish | Jeremy Daer | 2016-04-29 | 1 | -15/+13 |
| | | | | | | | | Use the updated changelog from the first merge: 7254517 References #22806, #24762. [ci skip] | ||||
* | Merge pull request #24788 from connorshea/patch-1 | Jon Moss | 2016-04-29 | 1 | -52/+52 |
|\ | | | | | Update configuring.md with colons and periods | ||||
| * | Update configuring.md with colons and periods | Connor Shea | 2016-04-29 | 1 | -52/+52 |
|/ | | | Some configuration options started with a capital letter indicating the beginning of a sentence, which didn't makes sense without the colons. Similarly, some were missing periods at the end of their descriptions. [ci skip] | ||||
* | Merge pull request #24787 from connorshea/patch-1 | Rafael França | 2016-04-29 | 2 | -3/+3 |
|\ | | | | | Patch 1 | ||||
| * | Consistent spelling of "gzipped" [ci skip] | Connor Shea | 2016-04-29 | 1 | -1/+1 |
| | | |||||
| * | Fix typos in asset_pipeline.md [ci skip] | Connor Shea | 2016-04-29 | 1 | -2/+2 |
|/ | | | Per discussion in #24786. | ||||
* | Merge pull request #24786 from vipulnsward/document-gzip-assets | Richard Schneeman | 2016-04-29 | 2 | -0/+13 |
|\ | | | | | Document config.assets.gzip flag. | ||||
| * | Document config.assets.gzip flag. Follow up of ↵ | Vipul A M | 2016-04-29 | 2 | -0/+13 |
| | | | | | | | | | | | | https://github.com/rails/sprockets-rails/pull/342. [ci skip] | ||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-04-29 | 8 | -25/+31 |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/configuring.md | ||||
| * | | s/statment/statement/ | Vipul A M | 2016-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | be specific when the debug_exception_response_format to :api | Vipul A M | 2016-04-23 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Mention default values for `debug_exception_response_format` in configuring ↵ | Prathamesh Sonpatki | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | guide [ci skip] | ||||
| * | | `debug_exception_format` is set to :api by default for API apps only, not ↵ | Prathamesh Sonpatki | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | for normal apps. [ci skip] | ||||
| * | | [ci skip] Aline results of code examples in comments | yui-knk | 2016-04-20 | 1 | -2/+2 |
| | | | |||||
| * | | s/determins/determines/ | Vipul A M | 2016-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | - Be consistent in providing file locations of schema, model and initializer | Vipul A M | 2016-04-13 | 1 | -1/+6 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | - Make sure we end sentences | Vipul A M | 2016-04-13 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | - Change from "The Task" to "The Update Task" as referred elsewhere [ci skip] | ||||
| * | | [ci skip] Add some missing commas | Prathamesh Sonpatki | 2016-04-12 | 1 | -2/+2 |
| | | | |||||
| * | | [ci skip] Typo fix. `loggs` -> `logs` | Prathamesh Sonpatki | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | - Fix typo in config guide, from config.logger section | Vipul A M | 2016-04-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | - Make bulleted lists, end properly [ci skip] | ||||
| * | | s/Thoughtbot/thoughtbot/ | Vipul A M | 2016-04-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | See https://github.com/thoughtbot/presskit/blob/master/README.md#name for name capitalization. [ci skip] | ||||
| * | | [ci skip] Fix formatting of code snippet in Action Cable guide | Prathamesh Sonpatki | 2016-04-05 | 1 | -7/+8 |
| | | | |||||
| * | | [ci skip] Update code used for filtering passwords in the configuring guide | Prathamesh Sonpatki | 2016-04-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #24776 from prathamesh-sonpatki/aj-release-notes | Kasper Timm Hansen | 2016-04-29 | 2 | -1/+22 |
|\ \ \ | |_|/ |/| | | Active Job: Add note about ability to configure adapters on per job basis in CHANGELOG and release notes | ||||
| * | | Active Job: Add note about ability to configure adapters on per job basis in ↵ | Prathamesh Sonpatki | 2016-04-29 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | CHANGELOG and release notes. [ci skip] | ||||
* | | | Merge pull request #24762 from Envek/solid_durations_2 | Andrew White | 2016-04-29 | 4 | -11/+47 |
|\ \ \ | | | | | | | | | [FIX] Change 1.week to create 1 week durations instead of 7 days durations. | ||||
| * | | | Change 1.week to create 1 week durations instead of 7 days durations. | Andrey Novikov | 2016-04-28 | 4 | -11/+47 |
| | | | | | | | | | | | | | | | | This is just to remove astonishment from getting `3600 seconds` from typing `1.hour`. | ||||
* | | | | Merge pull request #24781 from maclover7/rm-env | Guillermo Iguaran | 2016-04-28 | 3 | -12/+39 |
|\ \ \ \ | | | | | | | | | | | Remove last uses of `@env[]` and `@env[]=` | ||||
| * | | | | Remove last uses of `@env[]` and `@env[]=` | Jon Moss | 2016-04-28 | 3 | -12/+39 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last August (2015), @tenderlove worked to remove all `@env[]` and `@env[]=`, in favor of using `set_header`, `get_header`, etc. (Here's an [example commit](https://github.com/rails/rails/commit/f16a33b68efc3dc57cfafa27651b9a765e363fbf)). This PR should remove the last uses of these methods, and fully convert them to the newly standardized API. | ||||
* | | | | Merge pull request #24653 from kbrock/kinder_locking_column | Rafael França | 2016-04-28 | 2 | -1/+54 |
|\ \ \ \ | | | | | | | | | | | schema_load triggers 2nd schema_load (via locking) | ||||
| * | | | | test the number of times the schema is loading | Keenan Brock | 2016-04-28 | 1 | -0/+53 |
| | | | | | |||||
| * | | | | schema_load triggers 2nd schema_load (via locking) | Keenan Brock | 2016-04-28 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, loading the schema (schema_load) accesses the locking column (locking_column) which defaults the value (reset_locking_column) which invalidates the schema (reload_schema_from_cache) which forces another schema load. Good news: The second schema_load does accesses locking_column, but locking_column is set, so it does not reset_locking_column and it does not trigger an infinite loop. The solution is not invalidate the cache while default locking_column | ||||
* | | | | Merge pull request #24770 from vipulnsward/guieds-type | Rafael França | 2016-04-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Pass over debugging guide | ||||
| * | | | Pass over debugging guide | Vipul A M | 2016-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #24772 from javiervidal/broken_links_ryandaigle | Kasper Timm Hansen | 2016-04-28 | 2 | -14/+14 |
|\ \ \ \ | |/ / / |/| | | | Fix broken links to ryandaigle.com [ci skip] | ||||
| * | | | Fix broken links to ryandaigle.com [ci skip] | Javier Vidal | 2016-04-28 | 2 | -14/+14 |
|/ / / | |||||
* | | | Merge pull request #24764 from deivid-rodriguez/review_debugging_guide | Vipul A M | 2016-04-28 | 1 | -140/+185 |
|\ \ \ | | | | | | | | | Review the `byebug` debugging guide [ci skip] | ||||
| * | | | Review the `byebug` debugging guide | David Rodríguez | 2016-04-28 | 1 | -140/+185 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | * Several formatting fixes. * Updated command outputs to latest version. * Minor rewordings. [ci skip] | ||||
* | | | Merge pull request #24765 from ↵ | Vipul A M | 2016-04-28 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | ralinchimev/fix-inconsistencies-in-rails-documentation-generate-controller-examples Fix inconsistent usage of a capital letter in rails generate examples [ci skip] | ||||
| * | | | Fix inconsistent usage of capital letter in rails generate command examples | Ralin Chimev | 2016-04-28 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #24761 from rubys/patch-3 | Richard Schneeman | 2016-04-27 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Update to the Rails 5 version of the book [ci skip] | ||||
| * | | Update to the Rails 5 version of the book | Sam Ruby | 2016-04-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #24759 from vipulnsward/push-initilizer-to-end | Rafael França | 2016-04-27 | 1 | -4/+4 |
|\ \ | | | | | | | Push action_view.collection_caching to be called towards the end |