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

55370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Matthew Conway
7482572347 Update README extension in Getting Started guide 
Generated Rails app READMEs are Markdown as of 9739f07d763e29b1c5d71cabf1ca8cfa4421e653
 2015-12-20 22:06:22 -08:00
Rafael França
615f93d314 Merge pull request #22712 from jonatack/update-changelogs 
Add missing @claudiob credit to change log [skip ci]
 2015-12-20 23:52:39 -02:00
Sean Griffin
5609958841 Merge pull request #22715 from kamipo/remove_mysql_adapter 
Remove legacy mysql adapter
 2015-12-20 18:44:26 -07:00
Ryuta Kamizono
af9878d640 Remove legacy mysql adapter 
Follow up to #22642.
 2015-12-21 08:46:55 +09:00
yuuji.yaginuma
4f8c36ab70 display detailed information in inline reporting 
The errors message only was not displayed, as if it did not use the inline reporting,
modified to also information the method name and the like in error are displayed.

```
# before
Failed assertion, no message given.

bin/rails test test/models/user_test.rb:5
```

```
# after
Failure:
UserTest#test_the_truth:
Failed assertion, no message given.

bin/rails test test/models/user_test.rb:5
```
 2015-12-21 07:48:53 +09:00
Jon Atack
d3e98c6f30 Add missing @claudiob credit to change log [skip ci] 2015-12-20 22:03:53 +01:00
Kasper Timm Hansen
249e943a0d Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails-guide 
Upgrade Guide: Add missing period, ✂️ whitespace [skip ci]
 2015-12-20 21:16:27 +01:00
Jon Atack
d4ee8a9953 Upgrade Guide: Add missing period, ✂️ whitespace [skip ci] 2015-12-20 21:12:42 +01:00
Sean Griffin
0207464f9b Merge pull request #22704 from rajcybage/mysql_fix 
mysql2 adapter instead of mysql [ci skip]
 2015-12-20 11:56:33 -07:00
Rajarshi Das
d88cc3454e mysql2 adapter instead of mysql [ci skip] 2015-12-20 22:29:33 +05:30
Richard Schneeman
fb44e217ef Merge pull request #22707 from yui-knk/fix_warning 
Suppress warning ambiguous first argument
 2015-12-20 08:43:32 -06:00
yui-knk
912093d01e Suppress warning ambiguous first argument 
Suppress warning (warning: ambiguous first argument; put
parentheses or a space even after `/' operator)
 2015-12-20 22:15:56 +09:00
Vijay Dev
b691d62be9 Merge branch 'master' of github.com:rails/docrails 2015-12-20 12:33:46 +00:00
Jan Habermann
b864d88750 Fix documentation for mattr_accessor methods 2015-12-20 12:25:37 +01:00
Rafael Mendonça França
cf8621a3e9 Add a commend about deprecation of ActiveSupport::OrderedHash 
It is in the code to provides backward compatibility for people that
have this class serialized as YAML in some storage.

Closes #22681
 2015-12-20 01:43:20 -02:00
Yves Senn
043660249b Merge pull request #22697 from kamipo/remove_unused_mysql_specific_schema 
Remove unused `test/schema/mysql_specific_schema.rb`
 2015-12-19 15:20:55 +01:00
Yves Senn
8615f8b5c8 docs, follow up to #22699. [ci skip] 2015-12-19 14:42:09 +01:00
Kasper Timm Hansen
f95557b47f Merge pull request #22699 from omotenko/patch-1 
Update README.md
 2015-12-19 14:39:41 +01:00