Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24713 from tomkadwill/fix_counter_cache_increment | Sean Griffin | 2016-04-30 | 3 | -0/+14 |
|\ | | | | | | | | | Fix counter_cache double increment bug Close #24183 | ||||
| * | Fix counter_cache double increment bug | Tom Kadwill | 2016-04-28 | 3 | -0/+14 |
| | | |||||
* | | Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in ↵ | willnet | 2016-04-30 | 4 | -5/+5 |
| | | | | | | | | | | | | | | guides [ci skip] Guides should be updated because ActionDispatch::LoadInterlock was replaced with ActionDispatch::Executor at #23807. | ||||
* | | Fix initial value effects for sum along to ruby 2.4 | Kenta Murata | 2016-04-30 | 2 | -5/+85 |
| | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | | Merge pull request #24801 from y-yagi/fix_incorrect_module_name | Jon Moss | 2016-04-30 | 1 | -1/+1 |
|\ \ | | | | | | | fix incorrect module name [ci skip] | ||||
| * | | fix incorrect module name [ci skip] | yuuji.yaginuma | 2016-05-01 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #24798 from mrkjlchvz/mc-grammar | Vipul A M | 2016-05-01 | 0 | -0/+0 |
|\ \ | | | | | | | Fix grammar. [ci skip] | ||||
| * | | Fix grammar. | Mark | 2016-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #24791 from maclover7/jm-rm-ar-rails-mention | Rafael França | 2016-04-30 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | Replace `Rails.version.to_f` with Active Record | ||||
| * | | | Replace `Rails.version.to_f` with Active Record | Jon Moss | 2016-04-30 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Rails should not be explicity mentioned within Active Record, since railties and the Rails ecosystem is not required for use. | ||||
* | | | | Merge pull request #24777 from tomkadwill/action_pack_typos_3 | Vipul A M | 2016-04-30 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Fix actionpack typos [ci skip] | ||||
| * | | | | Fix actionpack typos [ci skip] | Tom Kadwill | 2016-04-30 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | | |