aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix title of README according to Markdown conventionsAaron Ang2016-02-253-4/+4
| | | | | | | | | The first heading in some README's are indicated using a second level heading (`##`), which in my opinion is of incorrect structure. Therefore, in this patch I changed the first heading to a first level heading (`#`) in README's where this incorrect structure occurs. [ci skip]
* 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.
| * | | Change ActionMailer's default caching configuration and update generator's ↵Stan Lo2016-02-234-1/+13
| | | | | | | | | | | | | | | | environment templates
| * | | Remove unnecessarily included modules in ActionController::CachingStan Lo2016-02-231-1/+0
| | | |
| * | | Move ActionMailer::Caching's content into ActionMailer::Base instead of ↵Stan Lo2016-02-234-32/+21
| | | | | | | | | | | | | | | | | | | | | | | | including it Remove useless helper in ActionDispatch::Caching and fix indentation
| * | | Make caching configuration more flexibleStan Lo2016-02-233-11/+21
| | | |
| * | | Move most caching methods to ActionDispatch::Caching, and let ActionMailer ↵Stan Lo2016-02-234-109/+67
| | | | | | | | | | | | | | | | and ActionController to include it
| * | | Move caching/fragments in ActionMailer and ActionController to ↵Stan Lo2016-02-234-159/+5
| | | | | | | | | | | | | | | | action_dispatch/caching/fragments
| * | | Porting ActionController::Caching to ActionMailer::CachingStan Lo2016-02-2311-0/+481
| | | |
* | | | Merge pull request #23842 from kamipo/drop_table_test_text_limits_as_wellRafael França2016-02-231-9/+13
|\ \ \ \ | | | | | | | | | | `drop_table :test_text_limits` as well
| * | | | `drop_table :test_text_limits` as wellRyuta Kamizono2016-02-241-9/+13
| | | | | | | | | | | | | | | | | | | | Follow up to 3b01785.
* | | | | Use the trick to get beta releases in the GemfileRafael Mendonça França2016-02-231-1/+1
| | | | |
* | | | | Merge pull request #23836 from sstephenson/turbolinks-5Rafael França2016-02-236-17/+17
|\ \ \ \ \ | | | | | | | | | | | | Turbolinks 5 compatibility changes
| * | | | | Update JavaScript guide for Turbolinks 5Sam Stephenson2016-02-231-6/+6
| | | | | |
| * | | | | Update to the latest Turbolinks gemsSam Stephenson2016-02-231-3/+3
| | | | | |
| * | | | | New apps get the Turbolinks beta gemSam Stephenson2016-02-231-2/+2
| | | | | |
| * | | | | Switch to `data-turbolinks-track="reload"`Sam Stephenson2016-02-233-6/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #23838 from ↵Rafael França2016-02-231-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_assert_nothing_raised_deprecation_warning_format Fix `assert_nothing_raised` deprecation warning format
| * | | | | Fix `assert_nothing_raised` deprecation warning formatRyuta Kamizono2016-02-241-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` DEPRECATION WARNING: Passing arguments to assert_nothing_raised is deprecated and will be removed in Rails 5.1. ``` After: ``` DEPRECATION WARNING: Passing arguments to assert_nothing_raised is deprecated and will be removed in Rails 5.1. ```
* | | | | Merge pull request #23840 from yui-knk/improve_the_readability_of_ar_docJon Moss2016-02-231-6/+14
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] Improve the readability of documents of nested_attributes
| * | | | [ci skip] Improve the readability of documents of nested_attributesyui-knk2016-02-241-6/+14
| | | | |
* | | | | Merge pull request #23837 from mgroeneman/fix-form-helper-guide-typoJon Moss2016-02-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in Form Helpers Guide
| * | | | | [ci skip] No hyphen in 'side effects'Michael Groeneman2016-02-231-1/+1
| | | | | |
| * | | | | [ci skip] Fix typo in Form Helpers GuideMichael Groeneman2016-02-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23632 from maclover7/fix-23620Matthew Draper2016-02-242-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | Fix `request.ssl?` bug with Action Cable
| * | | | Fix `request.ssl?` bug with Action CableJon Moss2016-02-232-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This bug affects `wss://` requests when running Action Cable in-app. Fixes #23620.
* | | | | Revert changes to validations from PR #18612eileencodes2016-02-239-89/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to fix issue #17621 we added a check to validations that determined if a record should be validated. Based on the existing tests and behavior we wanted we determined the best way to do that was by checking if `!record.peristed? || record.changed? || record.marked_for_destruction?` This change didn't make it into a release until now. When #23790 was opened we realized that `valid?` and `invalid?` were broken and did not work on persisted records because of the `!record.persisted?`. While there is still a bug that #17621 brought up, this change was too drastic and should not be a RC blocker. I will work on fixing this so that we don't break `valid?` but also aren't validating parent records through child records if that parent record is validate false. This change removes the code changes to validate and the corresponding tests. It adds tests for two of the bugs found since Rails 5 beta2 release. Fixes #17621
* | | | Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-232-0/+15
|\ \ \ \ | | | | | | | | | | Alternative to #23638 log to STDOUT via env var
| * | | | Alternative to #23638 log to STDOUT via env varschneems2016-02-172-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People who deploy to containers or other places where they might have some sort of a log wrapping service use stdout. With this change new rails apps can be configured to output to STDOUT via setting `RAILS_LOG_TO_STDOUT` to any value. This allows container images or services to set the value for all apps without having to modify configuration for each application. If an app wants to opt out, they can either delete from the env hash, or remove that configuration. cc/ @rafaelfranca
* | | | | clear digest cache between testsAaron Patterson2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | otherwise we don't get the log messages we're looking for and the tests fail intermittently.
* | | | | Merge pull request #23628 from maclover7/fix-23625Sean Griffin2016-02-234-1/+38
|\ \ \ \ \ | | | | | | | | | | | | Fix issue #23625
| * | | | | Fix issue #23625Jon Moss2016-02-184-1/+38
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a bug where if the primary key used is not `id` (ex: `uuid`), and has a `validates_uniqueness_of` in the model, a uniqueness error would be raised. This is a partial revert of commit `119b9181ece399c67213543fb5227b82688b536f`, which introduced this behavior.
* | | | | Merge pull request #23789 from ↵Rafael França2016-02-2327-55/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr Wisetara/deprecate args active support test case#assert nothing raised for pr
| * | | | | add deprecation warning to assert_nothing_raised and changelog entryTara Scherner de la Fuente2016-02-222-2/+15
| | | | | |
| * | | | | update assert_nothing_raised in testing.mdTara Scherner de la Fuente2016-02-221-1/+1
| | | | | |
| * | | | | remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-2225-54/+54
| | |/ / / | |/| | |
* | | | | reestablish previous connection after creating all databasesAaron Patterson2016-02-232-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating all databases mutates the connection pool. This patch restores the connection pool to the connection spec established before creating all databases. Fixes #23279
* | | | | Merge pull request #23813 from lifo/faye-websocketDavid Heinemeier Hansson2016-02-235-7/+51
|\ \ \ \ \ | | | | | | | | | | | | Improve Action Cable reconnection reliability
| * | | | | Fix isAlive condition and add more loggingJavan Makhmali2016-02-231-5/+7
| | | | | |
| * | | | | ActionCable.logJavan Makhmali2016-02-233-14/+25
| | | | | |
| * | | | | Uninstall event handlers when replacing WebSocket instanceJavan Makhmali2016-02-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Ensures we don't get "onclose" events from a previous WebSocket that was in the "closing" state