TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
55,388 Commits 2 Branches 0 Tags 294 MiB
9917c0c255
Commit Graph

55388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuuji.yaginuma
9917c0c255 remove cors initializer from rails app 
`rack-cors` gem is defined in Gemfile by default only if the api,
not defined by default in rails app.
 2015-12-22 18:39:08 +09:00
Yves Senn
aa96537d37 Merge pull request #22701 from maclover7/rails-5-release-notes 
[WIP] Rails 5 release notes [ci skip]
 2015-12-22 09:10:22 +01:00
Yves Senn
91b85b5a15 Merge pull request #22483 from y-yagi/use_bin_test_in_plugins_guide 
use `bin/test` in plugins guide [ci skip]
 2015-12-22 08:53:12 +01:00
Matthew Draper
a0301c356a Merge pull request #22752 from y-yagi/remove_div_for_from_doc 
do not use `div_for` in example [ci skip]
 2015-12-22 17:16:00 +10:30
Matthew Draper
a60e68242f Merge pull request #22754 from ryohashimoto/151222_remove_content_tag_for 
remove content_tag_for example
 2015-12-22 17:14:22 +10:30
Matthew Draper
b5049bc995 Merge pull request #22753 from gwincr11/keeps-options-breaks-assets 
Fix .keep file issue with ActionCable
 2015-12-22 17:12:03 +10:30
Ryo Hashimoto
4f5536068d remove content_tag_for example 2015-12-22 14:51:05 +09:00
Cory Gwin
a859108c82 Fix .keep file issue with ActionCable 
Fixes #22708
Make sure the channels file is create in assets/javascript/ so require
tree works in asset pipeline.
 2015-12-21 21:41:00 -08:00
yuuji.yaginuma
b441c5d191 do not use div_for in example [ci skip] 
`div_for` removed in 01e94ef
 2015-12-22 14:36:24 +09:00
Guillermo Iguaran
17a4e45048 Merge pull request #22746 from davidenglishmusic/master 
corrects a typo [ci-skip]
 2015-12-21 21:22:03 -05:00
David English
fc027e1faf corrects a typo 2015-12-21 18:07:49 -08:00
Rafael França
e4e9d91097 Merge pull request #22709 from jonatack/clarify-explanation-for-new-config-halt-callback-chains 
Clarify config settings for AS::halt_callback_chains_on_return_false
 2015-12-21 23:32:21 -02:00
Claudio B
7c4a7e64dc Merge pull request #22745 from claudiob/fix-hartl-link 
Fix Rails tutorial link
 2015-12-21 17:29:03 -08:00
claudiob
a5a2027749 Fix Rails tutorial link 
[ci skip]

The old link is 404 not found.
The link matches what the rest of the documentation already points to:

* 2de2263118/guides/source/getting_started.md (L2052)
* 2de2263118/README.md (L74)
 2015-12-21 17:25:09 -08:00
yuuji.yaginuma
0e7c08d189 use bin/test in plugins guide [ci skip] 
`bin/test` can use the same API as the `bin/rails test`, since it is possible to run a flexible test than rake,
I think better to use a guide even `bin/test`.
 2015-12-22 09:02:24 +09:00
Jon Moss
3fd2e43b20 Add Rails 5.0 Release Notes 
[ci skip]
 2015-12-21 17:04:41 -05:00
Rafael França
2de2263118 Merge pull request #22739 from akshay-vishnoi/fix-docs 
[ci skip] Fix typo
 2015-12-21 19:40:53 -02:00
Akshay Vishnoi
656ab0dfc9 [ci skip] Fix typo 2015-12-22 03:06:35 +05:30
Rafael França
73dcf00c1f Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable 
Ensure Action Cable files are removed when `skip_action_cable` is set.
 2015-12-21 19:01:34 -02:00
Rafael Mendonça França
f51a30c666 Use the generators options to not generate channel assets 2015-12-21 18:58:08 -02:00
Jey Balachandran
96093e3cf7 Ensure Action Cable files are removed when skip_action_cable is set. 
The Action Cable generators creates four files which need to be removed
if `skip_action_cable` is set.

1. `app/assets/javascripts/cable.coffee`
2. `app/channels/application_cable/channel.rb`
3. `app/channels/application_cable/connection.rb`
4. `config/redis/cable.yml`

Fixes #22669.
 2015-12-21 15:27:42 -05:00
Kasper Timm Hansen
daa890331e Merge pull request #22727 from prathamesh-sonpatki/fix-master 
Ensure that assets are enabled back after the test that tests assets are disabled
 2015-12-21 21:18:40 +01:00
Rafael França
68af99c942 Merge pull request #22736 from akshay-vishnoi/fix-changelogs 
[ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718)
 2015-12-21 18:01:18 -02:00
Akshay Vishnoi
5bae9d4f30 [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718) 2015-12-22 01:20:29 +05:30
Claudio B
75812e1bda Merge pull request #22735 from reshleman/patch-1 
Update "Support" in ActionCable README [ci skip]
 2015-12-21 11:46:36 -08:00
Robert Eshleman
a61b9be813 Update "Support" in ActionCable README [ci skip] 
* Add link to API documentation
* Link to issue tracker for rails/rails (instead of rails/actioncable)
* Add link to rails-core mailing list for feature requests
 2015-12-21 14:31:32 -05:00
Matthew Draper
b7ac079068 Remember the parameter hash we return 
Callers expect to be able to manipulate it.
 2015-12-22 05:48:38 +10:30
Jon Atack
bdf280bef1 Clarify config settings for AS::halt_callback_chains_on_return_false 
[skip ci]
 2015-12-21 19:14:37 +01:00
Prathamesh Sonpatki
8b8b6e9378 Ensure that assets are enabled back after the test that tests assets are disabled 2015-12-21 22:33:16 +05:30
Yves Senn
c3989819ea Merge pull request #22693 from yui-knk/use_appropriate_rebuild_task 
Use an appropriate rebuild task on Travis
 2015-12-21 16:57:43 +01:00
yui-knk
bf8ca88b91 Use an appropriate rebuild task on Travis 
Use `db:mysql:rebuild` when testing mysql2,
`db:postgresql:rebuild` when testing postgresql
and no rebuild task when testing others.
 2015-12-22 00:55:13 +09:00
Yves Senn
a88ab73f7e Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-after-gem-call 
Fix using add_resource with a block after gem in custom generators
 2015-12-21 16:46:42 +01:00
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
Matthew Draper
78b523d182 Merge pull request #22722 from k0kubun/use-cgi-html-escape 
Use CGI.escapeHTML for html escape
 2015-12-22 00:23:40 +10:30
David Heinemeier Hansson
97eb5553f9 Merge pull request #22717 from nning/actioncable-readme-fixes 
ActionCable README.md fixes
 2015-12-21 14:32:44 +01:00
David Heinemeier Hansson
26a8320c72 Merge pull request #22692 from ryohashimoto/22669_api_generator 
Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
 2015-12-21 14:31:42 +01:00
Takashi Kokubun
51152fc0f8 Use CGI.escapeHTML for html escape 2015-12-21 20:58:42 +09:00
Kasper Timm Hansen
9aff14f1ee Merge pull request #22698 from y-yagi/display_detail_info_on_inline_report 
display detailed information in inline reporting
 2015-12-21 12:40:47 +01:00
Yves Senn
b06f6a1d8c Revert "Merge pull request #22486 from methyl/fix-includes-for-groupped-association" 
This reverts commit 537ac7d6ade61e95f2b70685ff2236b7de965bab, reversing
changes made to 9c9c54abe08d86967efd3dcac1d65158a0ff74ea.

Reason:
The way we preload associations will change the meaning of GROUP BY
operations. This is illustrated in the SQL generated by the added
test (failing on PG):

Association Load:
D, [2015-12-21T12:26:07.169920 #26969] DEBUG -- :   Post Load (0.7ms)  SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" = $1 GROUP BY posts.id ORDER BY SUM(comments.tags_count)  [["author_id", 1]]

Preload:
D, [2015-12-21T12:26:07.128305 #26969] DEBUG -- :   Post Load (1.3ms)  SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" IN (1, 2, 3) GROUP BY posts.id ORDER BY SUM(comments.tags_count)
 2015-12-21 12:31:52 +01:00
Yves Senn
078d7c9de7 Merge pull request #22719 from akshay-vishnoi/fix-docs 
[ci skip] `rails new project` generates README.md now
 2015-12-21 11:29:42 +01:00
Akshay Vishnoi
c8fe4edae7 [ci skip] rails new project generates README.md now 2015-12-21 15:56:24 +05:30
Yves Senn
fb3e1a6bc5 Merge pull request #22718 from gsamokovarov/fix-changelogs 
No more no changes entries in the CHANGELOGs [ci skip]
 2015-12-21 11:25:08 +01:00
Genadi Samokovarov
c5b6ec7b0f No more no changes entries in the CHANGELOGs 
During the `5.0.0.beta1` release, the CHANGELOGs got an entry like the
following:

```
* No changes.
```

It is kinda confusing as there are indeed changes after it. Not a
biggie, just a small pass over the CHANGELOGs.

[ci skip]
 2015-12-21 11:46:38 +02:00
Yves Senn
e65680ee74 Merge pull request #22581 from hirocaster/fix-expect-sample-code 
[ci skip]

Change output timming of sample code
 2015-12-21 10:32:09 +01:00
Yves Senn
537ac7d6ad Merge pull request #22486 from methyl/fix-includes-for-groupped-association 
Pass group values when including association

Conflicts:
	activerecord/CHANGELOG.md
 2015-12-21 10:10:07 +01:00
henning mueller
9f00021268 One long dash in headline. 2015-12-21 10:05:32 +01:00
Yves Senn
9c9c54abe0 Merge pull request #22706 from habermann24/fix_mattr_accessor_docs 
Fix documentation for mattr_accessor methods [ci skip]
 2015-12-21 09:47:04 +01:00
henning mueller
cb6f337aac Use default cable path in (in-app) server config example. 2015-12-21 09:44:02 +01:00
henning mueller
16bee0f5bd Replaced "Cable" by "ActionCable" in CoffeeScript examples. 2015-12-21 09:35:37 +01:00
Matthew Draper
85a8175cb0 Merge pull request #22716 from mattreduce/mattreduce-getting-started-guide 
Update README extension in Getting Started guide
 2015-12-21 18:34:26 +10:30