rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #22690 from claudiob/remove-blank-line	Richard Schneeman	2015-12-18	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove blank line generated in config.ru
\| * \| \| \| \| \| \|	Remove blank line generated in config.ru	claudiob	2015-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the lines of the other `.tt` files ([example](https://github.com/rails/rails/blob/1611ab4db173a7596a7a94c58dabf1483f070304/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L26)) that have the space after the condition to avoid too many white lines in the resulted file.
* \| \| \| \| \| \| \|	Merge pull request #22678 from akshay-vishnoi/base_test_case	Guillermo Iguaran	2015-12-18	1	-14/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ActionCable] declare asset_logged private
\| * \| \| \| \| \| \| \|	[ActionCable] declare asset_logged private	Akshay Vishnoi	2015-12-19	1	-14/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #22688 from claudiob/doc-cookie-serializer	Guillermo Iguaran	2015-12-18	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Explain what initializer/config_serializer does
\| * \| \| \| \| \| \| \|	Explain what initializer/config_serializer does	claudiob	2015-12-18	1	-0/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In line with the other initializers, add a short comment that explains what happens when you change the value of the initializer. [ci skip]
* \| \| \| \| \| \| \|	Merge pull request #22687 from claudiob/doc-cookie-serializer	Claudio B	2015-12-18	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	initializers/cookies_serializer is not new to 5.0
\| * \| \| \| \| \| \|	initializers/cookies_serializer is not new to 5.0	claudiob	2015-12-18	1	-1/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] The initializer has existed since 4.1, for instance see: https://github.com/rails/rails/blob/v4.1.0/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
* \| \| \| \| \| \|	Merge pull request #19423 from ↵	Aaron Patterson	2015-12-18	2	-2/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	yuroyoro/fix_performance_regression_of_preloading_has_many_through_relation Fix #12537 performance regression when preloading has_many_through association
\| * \| \| \| \| \| \|	Read already loaded association records from association.target	Tomohito Ozaki	2015-04-17	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For performance, Avoid instantiate CollectionProxy. Fixes #12537
* \| \| \| \| \| \| \|	Merge pull request #22682 from y-yagi/fix_typo_in_changelog	Sean Griffin	2015-12-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	fix typo in config value [ci skip]
\| * \| \| \| \| \| \|	fix typo in config value [ci skip]	yuuji.yaginuma	2015-12-19	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #22671 from habermann24/patch-1	Rafael França	2015-12-18	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in CHANGELOG
\| * \| \| \| \| \| \|	Fix typo in CHANGELOG	Jan	2015-12-18	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Add CHANGELOG headers for Rails 5.0.0.beta1	eileencodes	2015-12-18	10	-0/+50
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #22462 from lxsameer/i18n_html_wrap	Rafael França	2015-12-18	5	-0/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrapping i18n missing keys made optional
\| * \| \| \| \| \| \|	debug_missing_translation configuration added to action_view	Sameer Rahmani	2015-12-18	5	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`I18n.translate` helper will wrap the missing translation keys in a <span> tag only if `debug_missing_translation` configuration has a truthy value. Default value is `true`. For example in `application.rb`: # in order to turn off missing key wrapping config.action_view.debug_missing_translation = false
* \| \| \| \| \| \| \|	Change `alpha` to `beta1` to prep for release of Rails 5	eileencodes	2015-12-18	12	-43/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:tada: :beers:
* \| \| \| \| \| \| \|	Add task to test the release preparation	Rafael Mendonça França	2015-12-18	2	-2/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #22668 from ryohashimoto/151219_receive	Kasper Timm Hansen	2015-12-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `receive` spelling
\| * \| \| \| \| \| \| \|	Fix `receive` spelling	Ryo Hashimoto	2015-12-19	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #22658 from greysteil/handle-specified-schema-in-index-remove	Matthew Draper	2015-12-19	2	-3/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle specified schemas when removing a Postgres index
\| * \| \| \| \| \| \| \| \|	Handle specified schemas when removing a Postgres index	Grey Baker	2015-12-18	2	-3/+30
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #22667 from akshay-vishnoi/base_test_case	Rafael França	2015-12-18	1	-0/+22
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	[ActionCable] Test invalid action on channel
\| * \| \| \| \| \| \| \|	[ActionCable] Test invalid action on channel	Akshay Vishnoi	2015-12-18	1	-0/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix `receive` spelling and add whitespace	Kasper Timm Hansen	2015-12-18	1	-3/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Found `recieve` next to the correctly spelled method name, fixed it. Also we prefer a one space padding within hashes, add that.
* \| \| \| \| \| \| \|	Merge pull request #22666 from akshay-vishnoi/base_test_case	Rafael França	2015-12-18	1	-1/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ActionCable] test perform action with default action
\| * \| \| \| \| \| \| \|	[ActionCable] test perform action with default action	Akshay Vishnoi	2015-12-18	1	-1/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix test that fails in isolation	eileencodes	2015-12-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test needs to have a require for the Listen gem or else it returns an error when run by itself or with a certain order in the Active Support tests. We use `silence_warnings` because Listen has some warnings about private methods. It's already silenced when it's required in Active Support EventedFileUpdateChecker. ``` 1) Error: EventedFileUpdateCheckerTest#test_should_not_execute_the_block_if_no_paths_are_given: NameError: uninitialized constant EventedFileUpdateCheckerTest::Listen test/evented_file_update_checker_test.rb:21:in `teardown' ```
* \| \| \| \| \| \| \| \|	Delete duplicate test	eileencodes	2015-12-18	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The test was was in here twice so we were seeing this error: ``` activesupport/test/caching_test.rb:658: warning: method redefined; discarding old test_local_cache_of_read_nil activesupport/test/caching_test.rb:634: warning: previous definition of test_local_cache_of_read_nil was here ```
* \| \| \| \| \| \| \| \|	Don't need to use `Array.wrap`	Rafael Mendonça França	2015-12-18	2	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #22650 from derekprior/dp-actionpack-warnings	Rafael França	2015-12-18	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "instance variable not initialized" in tests
\| * \| \| \| \| \| \| \|	Fix "instance variable not initialized" in tests	Derek Prior	2015-12-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ActionPack test suite had a handful of these warnings when run. This was due to `assert_response` being tested outside the context of a controller instance where those instance variables would already have been initialized.
* \| \| \| \| \| \| \| \|	Merge pull request #20797 from byroot/prevent-url-for-ac-parameters	Rafael França	2015-12-18	6	-14/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent ActionController::Parameters in url_for
\| * \| \| \| \| \| \| \| \|	Prevent ActionController::Parameters from being passed to url_for directly	Jean Boussier	2015-12-15	6	-14/+14
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #22660 from y-yagi/add_line_break_between_methods	Rafael França	2015-12-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add line break between method of generated channel js
\| * \| \| \| \| \| \| \| \| \|	add line break between method of generated channel js	yuuji.yaginuma	2015-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	``` # before App.appearance = App.cable.subscriptions.create "AppearanceChannel", connected: -> # Called when the subscription is ready for use on the server disconnected: -> # Called when the subscription has been terminated by the server received: (data) -> # Called when there's incoming data on the websocket for this channel appear: -> @perform 'appear' away: -> @perform 'away' ``` ``` # after App.appearance = App.cable.subscriptions.create "AppearanceChannel", connected: -> # Called when the subscription is ready for use on the server disconnected: -> # Called when the subscription has been terminated by the server received: (data) -> # Called when there's incoming data on the websocket for this channel appear: -> @perform 'appear' away: -> @perform 'away' ```
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #22665 from akshay-vishnoi/base_test_case	Rafael França	2015-12-18	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ActionCable] Test available actions on Channel
\| * \| \| \| \| \| \| \| \| \| \|	[ActionCable] Test available actions on Channel	Akshay Vishnoi	2015-12-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Do not check the version anymore	Rafael Mendonça França	2015-12-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Our logic is complex now and we don't need to check the version to asset the behavior so I'm removing the checking here.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22657 from matthewd/loosen-version	Rafael Mendonça França	2015-12-18	4	-3/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow normal version updates within a release series
\| * \| \| \| \| \| \| \| \| \| \|	Allow normal version updates within a release series	Matthew Draper	2015-12-18	4	-3/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We originally chose to apply very strict versioning on the `rails` entry in the Gemfile, because our future versioning policy was not strongly defined. Now it is, and our policy is very much designed on the expectation that people will regularly update to the latest patch level in their release series... so we should encourage that. Of course, Gemfile.lock will do its job and prevent unplanned updates, just as it does for every other gem in the bundle... but if you run `bundle update`, we want to get you the latest bug/security fixes without requiring a manual edit of the Gemfile entry. Our current version could be a few different shapes, so it takes a bit of work to find the right specifier, but in principle, we match anything of the form x.y.*, where x.y matches our current release series.
* \| \| \| \| \| \| \| \| \| \| \|	Same gemspec formats everywhere	David Heinemeier Hansson	2015-12-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Stray line	David Heinemeier Hansson	2015-12-18	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Simplify	David Heinemeier Hansson	2015-12-18	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Now available in action_cable	David Heinemeier Hansson	2015-12-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Refer to rails command instead of rake in a bunch of places	David Heinemeier Hansson	2015-12-18	16	-40/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still more to do. Please assist!
* \| \| \| \| \| \| \| \| \| \| \|	Explain reason for eager loading	David Heinemeier Hansson	2015-12-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Explain Redis' role in Action Cable	David Heinemeier Hansson	2015-12-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Revert most of ff851017	Kasper Timm Hansen	2015-12-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We went back to `Thread.current[]` in 33e11e59.