aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update README.mdOleg Motenko2015-12-191-1/+1
|
* Deprecation warning now targets at 5.1Akira Matsuda2015-12-192-2/+6
| | | | | Also, added a test case to make sure that the default deprecation horizon is always bigger than the current Rails version.
* Merge pull request #22695 from sachin21/remove_ds_storeGuillermo Iguaran2015-12-191-0/+0
|\ | | | | Remove .DS_Store
| * Remove .DS_StoreSatoshi Ohmori2015-12-191-0/+0
|/
* Merge pull request #22479 from RobinClowers/fix-cache-notification-orderKasper Timm Hansen2015-12-192-20/+24
|\ | | | | Fix cache fetch miss notification order
| * Fix cache fetch miss notification orderRobin Clowers2015-12-022-20/+24
| | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22477. When I improved the caching instrumentation in edd33c08d98723ae9bb89cf7f019277117ed6414, I inadvertently changed the order of AS notifications when there is a cache miss.
* | Merge pull request #22683 from ↵Richard Schneeman2015-12-182-1/+1
|\ \ | | | | | | | | | | | | gwincr11/No-Doc-Rails__Generators__Actions__CreateMigration Add No Doc
| * | Add No DocCory Gwin2015-12-182-1/+1
| | | | | | | | | | | | In reference to rails/rail#22403 add a :nodoc:
* | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ | | | | | | | | Remove blank line generated in config.ru
| * | | Remove blank line generated in config.ruclaudiob2015-12-181-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_caseGuillermo Iguaran2015-12-181-14/+14
|\ \ \ \ | | | | | | | | | | [ActionCable] declare asset_logged private
| * | | | [ActionCable] declare asset_logged privateAkshay Vishnoi2015-12-191-14/+14
| | | | |
* | | | | Merge pull request #22688 from claudiob/doc-cookie-serializerGuillermo Iguaran2015-12-181-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Explain what initializer/config_serializer does
| * | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-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-serializerClaudio B2015-12-181-1/+0
|\ \ \ \ | | | | | | | | | | initializers/cookies_serializer is not new to 5.0
| * | | | initializers/cookies_serializer is not new to 5.0claudiob2015-12-181-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 Patterson2015-12-182-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.targetTomohito Ozaki2015-04-172-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | For performance, Avoid instantiate CollectionProxy. Fixes #12537
* | | | | Merge pull request #22682 from y-yagi/fix_typo_in_changelogSean Griffin2015-12-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | fix typo in config value [ci skip]
| * | | | fix typo in config value [ci skip]yuuji.yaginuma2015-12-191-1/+1
|/ / / /
* | | | Merge pull request #22671 from habermann24/patch-1Rafael França2015-12-181-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in CHANGELOG
| * | | | Fix typo in CHANGELOGJan2015-12-181-1/+1
|/ / / /
* | | | Add CHANGELOG headers for Rails 5.0.0.beta1eileencodes2015-12-1810-0/+50
| | | |
* | | | Merge pull request #22462 from lxsameer/i18n_html_wrapRafael França2015-12-185-0/+32
|\ \ \ \ | | | | | | | | | | wrapping i18n missing keys made optional
| * | | | debug_missing_translation configuration added to action_viewSameer Rahmani2015-12-185-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 5eileencodes2015-12-1812-43/+43
| | | | | | | | | | | | | | | | | | | | :tada: :beers:
* | | | | Add task to test the release preparationRafael Mendonça França2015-12-182-2/+5
| | | | |
* | | | | Merge pull request #22668 from ryohashimoto/151219_receiveKasper Timm Hansen2015-12-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix `receive` spelling
| * | | | | Fix `receive` spellingRyo Hashimoto2015-12-191-1/+1
| | | | | |
* | | | | | Merge pull request #22658 from greysteil/handle-specified-schema-in-index-removeMatthew Draper2015-12-192-3/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle specified schemas when removing a Postgres index
| * | | | | | Handle specified schemas when removing a Postgres indexGrey Baker2015-12-182-3/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22667 from akshay-vishnoi/base_test_caseRafael França2015-12-181-0/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ActionCable] Test invalid action on channel
| * | | | | [ActionCable] Test invalid action on channelAkshay Vishnoi2015-12-181-0/+22
| | | | | |
* | | | | | Fix `receive` spelling and add whitespaceKasper Timm Hansen2015-12-181-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_caseRafael França2015-12-181-1/+11
|\ \ \ \ \ | | | | | | | | | | | | [ActionCable] test perform action with default action
| * | | | | [ActionCable] test perform action with default actionAkshay Vishnoi2015-12-181-1/+11
| | | | | |
* | | | | | Fix test that fails in isolationeileencodes2015-12-181-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 testeileencodes2015-12-181-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ça2015-12-182-2/+2
|/ / / / /
* | | | | Merge pull request #22650 from derekprior/dp-actionpack-warningsRafael França2015-12-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix "instance variable not initialized" in tests
| * | | | | Fix "instance variable not initialized" in testsDerek Prior2015-12-171-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-parametersRafael França2015-12-186-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prevent ActionController::Parameters in url_for
| * | | | | | Prevent ActionController::Parameters from being passed to url_for directlyJean Boussier2015-12-156-14/+14
| | | | | | |
* | | | | | | Merge pull request #22660 from y-yagi/add_line_break_between_methodsRafael França2015-12-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add line break between method of generated channel js
| * | | | | | | add line break between method of generated channel jsyuuji.yaginuma2015-12-181-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_caseRafael França2015-12-181-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ActionCable] Test available actions on Channel
| * | | | | | | | [ActionCable] Test available actions on ChannelAkshay Vishnoi2015-12-181-0/+4
| | | | | | | | |
* | | | | | | | | Do not check the version anymoreRafael Mendonça França2015-12-181-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-versionRafael Mendonça França2015-12-184-3/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Allow normal version updates within a release series
| * | | | | | | | Allow normal version updates within a release seriesMatthew Draper2015-12-184-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.