Commit Graph

55295 Commits

Author SHA1 Message Date
Will Fisher
12dd2ca863 Fixes using add_source with a block after using gem in a custom rails
generator template.
2015-12-21 06:06:30 -09:00
Rafael França
0af3722335 Merge pull request #22671 from habermann24/patch-1
Fix typo in CHANGELOG
2015-12-18 19:30:08 -02:00
Jan
4942b41267 Fix typo in CHANGELOG 2015-12-18 22:25:57 +01:00
eileencodes
099ddfdefd Add CHANGELOG headers for Rails 5.0.0.beta1 2015-12-18 15:58:25 -05:00
Rafael França
cbf827bc9c Merge pull request #22462 from lxsameer/i18n_html_wrap
wrapping i18n missing keys made optional
2015-12-18 18:47:59 -02:00
Sameer Rahmani
c1dbb13eac debug_missing_translation configuration added to action_view
`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
2015-12-18 22:45:05 +03:30
eileencodes
7eae0bb88e Change alpha to beta1 to prep for release of Rails 5
🎉 🍻
2015-12-18 12:14:09 -05:00
Rafael Mendonça França
7c4080aac4 Add task to test the release preparation 2015-12-18 14:56:26 -02:00
Kasper Timm Hansen
1c47f7d184 Merge pull request #22668 from ryohashimoto/151219_receive
Fix `receive` spelling
2015-12-18 17:28:31 +01:00
Matthew Draper
f07211f4f4 Merge pull request #22658 from greysteil/handle-specified-schema-in-index-remove
Handle specified schemas when removing a Postgres index
2015-12-19 02:48:23 +10:30
Ryo Hashimoto
161dc68599 Fix receive spelling 2015-12-19 01:09:16 +09:00
Rafael França
905a2a176b Merge pull request #22667 from akshay-vishnoi/base_test_case
[ActionCable] Test invalid action on channel
2015-12-18 14:07:55 -02:00
Kasper Timm Hansen
6a2c3c4c83 Fix receive spelling and add whitespace
Found `recieve` next to the correctly spelled method name, fixed it.

Also we prefer a one space padding within hashes, add that.
2015-12-18 16:53:04 +01:00
Akshay Vishnoi
46adddbfb5 [ActionCable] Test invalid action on channel 2015-12-18 21:10:06 +05:30
Rafael França
d51c04fa42 Merge pull request #22666 from akshay-vishnoi/base_test_case
[ActionCable] test perform action with default action
2015-12-18 13:22:49 -02:00
eileencodes
eac2eea3e1 Fix test that fails in isolation
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'
```
2015-12-18 10:17:28 -05:00
eileencodes
65146b58d1 Delete duplicate test
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
```
2015-12-18 10:17:28 -05:00
Rafael Mendonça França
376cfeb83e Don't need to use Array.wrap 2015-12-18 13:16:01 -02:00
Akshay Vishnoi
fef41f40b6 [ActionCable] test perform action with default action 2015-12-18 20:45:43 +05:30
Rafael França
027d964d89 Merge pull request #22650 from derekprior/dp-actionpack-warnings
Fix "instance variable not initialized" in tests
2015-12-18 12:49:36 -02:00
Rafael França
b5c13fcdaa Merge pull request #20797 from byroot/prevent-url-for-ac-parameters
Prevent ActionController::Parameters in url_for
2015-12-18 12:47:38 -02:00
Rafael França
90101afe1a Merge pull request #22660 from y-yagi/add_line_break_between_methods
add line break between method of generated channel js
2015-12-18 12:42:50 -02:00
Rafael França
6b88b98327 Merge pull request #22665 from akshay-vishnoi/base_test_case
[ActionCable] Test available actions on Channel
2015-12-18 12:42:15 -02:00
Rafael Mendonça França
840b3dd9b2 Do not check the version anymore
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.
2015-12-18 12:39:19 -02:00
Akshay Vishnoi
db36507644 [ActionCable] Test available actions on Channel 2015-12-18 20:02:45 +05:30
Rafael Mendonça França
b7660e0660 Merge pull request #22657 from matthewd/loosen-version
Allow normal version updates within a release series
2015-12-18 12:31:06 -02:00
David Heinemeier Hansson
83e3a17d32 Same gemspec formats everywhere 2015-12-18 13:20:49 +01:00
David Heinemeier Hansson
eb5ca8e16d Stray line 2015-12-18 13:16:01 +01:00
David Heinemeier Hansson
ed33d1d641 Simplify 2015-12-18 13:15:56 +01:00
David Heinemeier Hansson
21efa5218b Now available in action_cable 2015-12-18 13:15:52 +01:00
David Heinemeier Hansson
ea4f0e2bab Refer to rails command instead of rake in a bunch of places
Still more to do. Please assist!
2015-12-18 13:01:10 +01:00
David Heinemeier Hansson
bced489ac7 Explain reason for eager loading 2015-12-18 13:01:10 +01:00
David Heinemeier Hansson
82f5dc5230 Explain Redis' role in Action Cable 2015-12-18 13:01:10 +01:00
Kasper Timm Hansen
fdf359d8eb [ci skip] Revert most of ff851017
We went back to `Thread.current[]` in 33e11e59.
2015-12-18 12:43:03 +01:00
Kasper Timm Hansen
49f2f0988b Merge pull request #22656 from akshay-vishnoi/fix-typos
[ci skip] Fix grammar
2015-12-18 12:37:08 +01:00
David Heinemeier Hansson
e50ea481dd Bring comment in line with rest of initializers 2015-12-18 12:30:34 +01:00
David Heinemeier Hansson
569e03d721 Explain the concept of config initializers for backwards compatibility 2015-12-18 12:30:24 +01:00
David Heinemeier Hansson
8669d5b571 Fix spacing 2015-12-18 12:21:31 +01:00
David Heinemeier Hansson
28dcadc014 These options are not changed nearly often enough to warrant inclusion like this at a high level 2015-12-18 12:20:35 +01:00
yuuji.yaginuma
4a7bd88eaf add line break between method of generated channel js
```
# 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'
```
2015-12-18 20:19:04 +09:00
David Heinemeier Hansson
e3dee30d56 Better explanation 2015-12-18 12:18:07 +01:00
David Heinemeier Hansson
3186fe582c Use the rails command, not rake, for all rails commands 2015-12-18 12:14:43 +01:00
David Heinemeier Hansson
719cddd67d README.md in the app is now used to describe the app itself, not Rails 2015-12-18 12:12:06 +01:00
David Heinemeier Hansson
9738ff91b1 More sensible ordering with the more important options first 2015-12-18 12:10:36 +01:00
David Heinemeier Hansson
7956d4014b List the major frameworks you can remove together 2015-12-18 12:07:44 +01:00
David Heinemeier Hansson
33e11e59cc Revert "Use Thread.current.thread_variable_set/get insetad of the direct accessors"
This reverts commit 301f43820562c6a70dffe30f4227ff0751f47d4f per @matthewd on https://github.com/rails/rails/pull/22630/files#r47997074
2015-12-18 12:02:47 +01:00
Akshay Vishnoi
ebad5c72d3 [ci skip] Fix grammar 2015-12-18 16:30:18 +05:30
Grey Baker
cda0c1f6a7 Handle specified schemas when removing a Postgres index 2015-12-18 10:07:10 +00:00
Kasper Timm Hansen
13007e57ba Merge pull request #22659 from y-yagi/fix_indent_in_controller_test
fix indentation of generated controller test
2015-12-18 10:49:30 +01:00
yuuji.yaginuma
703f1052ae fix indentation of generated controller test
```
# before
module Bukkits
  class UsersControllerTest < ActionDispatch::IntegrationTest
    include Engine.routes.url_helpers

      setup do
      @user = bukkits_users(:one)
    end
```

```
# after
module Bukkits
  class UsersControllerTest < ActionDispatch::IntegrationTest
    include Engine.routes.url_helpers

    setup do
      @user = bukkits_users(:one)
    end
```
2015-12-18 18:15:07 +09:00