aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23870 from ↵Jon Moss2016-02-241-0/+17
|\ | | | | | | | | akshaymohite/api-app-debug-exception-response-format-in-doc [ci skip] Need to mention debug_exception_response_format in the api_app documentation.
| * [ci skip] Need to mention debug_exception_response_format in the api_app ↵Akshay2016-02-251-0/+17
|/ | | | | | | | | documentation. - #23771 removed the reference to debug_exception_response_format from the api_app documentation. - We need to let users know, they have ability to configure debug_exception_response_format in their development environment. - Added documentation for the same in api_app.md file - Grammar corrections
* Merge pull request #23866 from abhishekjain16/documentJon Moss2016-02-242-2/+2
|\ | | | | [ci skip] Replace usage of rake routes with rails routes
| * [ci skip] Replace usage of rake routes with rails routesAbhishek Jain2016-02-252-2/+2
| |
* | Ensure suppressor runs before validationseileencodes2016-02-244-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ran into an issue where validations on a suppressed record were causing validation errors to be thrown on a record that was never going to be saved. There isn't a reason to run the validations on a record that doesn't matter. This change moves the suppressor up the chain to be run on the `save` or `save!` in the validations rather than in persistence. The issue with running it when we hit persistence is that the validations are run first, then we hit persistance, and then we hit the suppressor. The suppressor comes first. The change to the test was required since I added the `validates_presence_of` validations. Adding this alone was enough to demonstrate the issue. I added a new test to demonstrate the new behavior is explict.
* | Merge branch 'master' into treewipAaron Patterson2016-02-24198-1246/+2139
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (113 commits) remove useless method Updated file documentation [ci skip] changes caching guide to add note on weak etags Don't put config.action_mailer.perform_caching entry twice in development.rb Fix wording and wrong reference Add Ruby formatting to CHANGELOG entry Fix ActionView's cache section reference Do not define methods in the included block Add caching guide in ActionMailer basics Add ActionMailer configuration options Preparing for 5.0.0.beta3 release Update 5.0 release notes Enable tmp_restart plugin for puma Prep release for Rails 5 beta3 [ci skip] Move collection caching changelog entry. Ensure `drop_table` even if tests failure or interrupted :bomb: run the test @rafaelfranca :angry: Remove changelog entry for reverted commit Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip] No need CHANGELOG entry for #23849. ...
| * remove useless methodAaron Patterson2016-02-241-2/+0
| |
| * Merge pull request #23861 from chashmeetsingh/patch-1प्रथमेश Sonpatki2016-02-241-1/+1
| |\ | | | | | | Updated file documentation [ci skip]
| | * Updated file documentation [ci skip]Chashmeet Singh2016-02-241-1/+1
| |/
| * Merge pull request #23860 from zerothabhishek/weak-etag-guideRafael França2016-02-241-0/+8
| |\ | | | | | | Changes caching guide to add note on weak etags
| | * changes caching guide to add note on weak etagsAbhishek Yadav2016-02-241-0/+8
| | |
| * | Merge pull request #23859 from ↵Rafael França2016-02-241-8/+2
| |\ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/dont-put-perform-caching-config-twice Don't put config.action_mailer.perform_caching entry twice in development.rb
| | * | Don't put config.action_mailer.perform_caching entry twice in development.rbPrathamesh Sonpatki2016-02-241-8/+2
| | | |
| * | | Merge pull request #23857 from st0012/update-documentsRafael França2016-02-244-1/+26
| |\ \ \ | | |/ / | |/| | [ci skip] Update guide sources for mailer view caching feature
| | * | Fix wording and wrong referenceStan Lo2016-02-252-2/+2
| | | |
| | * | Fix ActionView's cache section referenceStan Lo2016-02-251-1/+1
| | | |
| | * | Add caching guide in ActionMailer basicsStan Lo2016-02-251-0/+16
| | | |
| | * | Add ActionMailer configuration optionsStan Lo2016-02-251-0/+3
| | | |
| | * | Update 5.0 release notesStan Lo2016-02-251-0/+6
| | | |
| * | | Merge pull request #23858 from claudiob/fix-aca-readmeClaudio B2016-02-241-4/+5
| |\ \ \ | | | | | | | | | | Add Ruby formatting to CHANGELOG entry
| | * | | Add Ruby formatting to CHANGELOG entryclaudiob2016-02-241-4/+5
| |/ / / | | | | | | | | | | | | [ci skip]
| * | | Do not define methods in the included blockRafael Mendonça França2016-02-241-293/+289
| | | | | | | | | | | | | | | | Instance methods can be defined in the module itself
| * | | Preparing for 5.0.0.beta3 releaseeileencodes2016-02-2410-0/+26
| | | | | | | | | | | | | | | | Adds changelog headers for beta3 release
| * | | Enable tmp_restart plugin for pumaRafael Mendonça França2016-02-241-0/+3
| | | | | | | | | | | | | | | | Fixes #23855
| * | | Prep release for Rails 5 beta3eileencodes2016-02-2412-45/+45
| |/ /
| * | [ci skip] Move collection caching changelog entry.Kasper Timm Hansen2016-02-241-25/+25
| | | | | | | | | | | | | | | We changed this in beta2, and only editing the original entry means people can't see that it was significantly changed.
| * | Merge pull request #23853 from kamipo/ensure_drop_tableRafael França2016-02-241-7/+5
| |\ \ | | | | | | | | Ensure `drop_table` even if tests failure or interrupted
| | * | Ensure `drop_table` even if tests failure or interruptedRyuta Kamizono2016-02-241-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | I was encountered remaining `:binary_testings` table by tests failure. When remaining `:binary_testings` table, never reach `drop_table` due to `create_table` in the test always fails.
| * | | :bomb: run the test @rafaelfranca :angry:Rafael Mendonça França2016-02-241-1/+1
| |/ /
| * | Remove changelog entry for reverted commiteileencodes2016-02-241-12/+0
| | | | | | | | | | | | | | | I had to revert changes made for this CHANGELOG entry so this is no longer valid. The change for this entry was removed in 2c02bc0.
| * | Merge pull request #23850 from prathamesh-sonpatki/changelog-for-23734Rafael França2016-02-241-0/+5
| |\ \ | | | | | | | | Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]
| | * | Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]Prathamesh Sonpatki2016-02-241-0/+5
| |/ /
| * | No need CHANGELOG entry for #23849.Rafael Mendonça França2016-02-241-16/+0
| | | | | | | | | | | | | | | | | | | | | It is not a released feature so we don't need to add changelogs to changes on it. [ci skip]
| * | Make internal class as nodocRafael Mendonça França2016-02-241-2/+2
| | | | | | | | | | | | Also use the new hash syntax.
| * | Merge pull request #23616 from piotrj/issue_23609_logger_broadcast_silencingRafael Mendonça França2016-02-244-21/+86
| |\ \ | | | | | | | | | | | | Fix logger silencing for broadcasted loggers
| | * | Fix logger silencing for broadcasted loggersPiotr Jakubowski2016-02-114-21/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #23609 Commit 629efb6 introduced thread safety to logger silencing but it didn't take into account the fact that the logger can be extended with broadcasting to other logger. This commit introduces local_level to broadcasting Module which enables broadcasted loggers to be properly silenced.
| * | | Always use the released coffee-rails in new applicationsRafael Mendonça França2016-02-241-6/+1
| | | | | | | | | | | | | | | | | | | | coffee-rails is stable now so we don't need to point to the master branch.
| * | | Merge pull request #23849 from prathamesh-sonpatki/fix-23822Rafael França2016-02-244-9/+35
| |\ \ \ | | | | | | | | | | Show permitted flag in the output of AC::Parameters#inspect
| | * | | Show permitted flag in the output of AC::Parameters#inspectPrathamesh Sonpatki2016-02-244-9/+35
| | | | | | | | | | | | | | | | | | | | - Fixes #23822.
| * | | | Ignore callstacks from Ruby stdlib in deprecationRafael Mendonça França2016-02-241-4/+12
| | | | | | | | | | | | | | | | | | | | Fixes #22982.
| * | | | Merge pull request #23795 from claudiob/replace-rack-with-rails-commandDavid Heinemeier Hansson2016-02-244-14/+64
| |\ \ \ \ | | |/ / / | |/| | | AppGenerator: Replace 'rake' with 'rails_command'
| | * | | Invoke 'rails' instead of 'rake' in AppGeneratorclaudiob2016-02-202-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Follows the convention from Rails 5 of invoking tasks on the command-line with `rails …` rather than `rake …`.
| | * | | AppGenerator: Replace 'rake' with 'rails_command'claudiob2016-02-204-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 5.0 is switching the Rails command line from 'rake …' to 'rails …', it makes sense to also replace the `rake` method in the Rails templates API. Based on feedback from @matthewd and @kaspth, I chose to replace `rake` with `rails_command`, which is less confusing than the alternatives `rails` or `command` or `rails_run` and is not Thor-reserved word like `task`.
| * | | | Merge pull request #20851 from tomprats/indifferent-sessionsRafael Mendonça França2016-02-249-17/+147
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Give Sessions Indifferent Access
| | * | | | Update Session to utilize indiffernt accessTom Prats2016-01-308-16/+127
| | | | | |
| | * | | | Update session to have indifferent accessTom Prats2016-01-293-2/+21
| | | | | |
| * | | | | Add changelog entry for #22825Rafael Mendonça França2016-02-241-0/+6
| | | | | |
| * | | | | Merge branch 'actionmailer-cache'Rafael Mendonça França2016-02-2416-69/+367
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rebased version of #22825. Closes #22825.
| | * | | | | Move private methods to the private visibilityRafael Mendonça França2016-02-242-22/+24
| | | | | | |
| | * | | | | Move Caching module to Abstract ControllerRafael Mendonça França2016-02-237-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abstract Controller is the common component between Action Mailer and Action Controller so if we need to share the caching component it need to be there.