Abdelkader Boudih
fb24d0ed6c
Remove legacy mysql adapter
2015-12-17 15:54:57 +00:00
Rafael França
0957c8ad67
Merge pull request #22640 from nateberkopec/fix-my-typo-and-clarify
...
Clarify thread_mattr_accessor subclass behavior documentation
2015-12-17 13:34:08 -02:00
Rafael França
0ff5fa14a3
Merge pull request #22637 from arunagw/aa-add-actioncable-to-build-step
...
Add actioncable to build step for release
2015-12-17 13:33:41 -02:00
Nate Berkopec
0c28a06495
Clarify thread_mattr_accessor subclass behavior documentation
...
[ci skip]
2015-12-17 10:31:54 -05:00
Rafael Mendonça França
606c435450
Use released turbolinks in the test suite
2015-12-17 13:31:49 -02:00
Arun Agrawal
cbed6163f1
Use FRAMEWORKS constant from tasks/release
to avoid duplication
2015-12-17 16:31:43 +01:00
Rafael Mendonça França
ff85101730
Copy-edit the Per Thread attribute accessor documentation
...
[ci skip]
2015-12-17 13:25:46 -02:00
Abdelkader Boudih
d9d8fca780
Merge pull request #22638 from lpaulmp/patch-1
...
Update USAGE [ci skip]
2015-12-17 15:20:00 +00:00
Paul Montero
96a63787bc
Update USAGE
...
Fix typo
2015-12-17 10:17:52 -05:00
David Heinemeier Hansson
301f438205
Use Thread.current.thread_variable_set/get insetad of the direct accessors
2015-12-17 16:15:41 +01:00
Rafael França
ce28270e6f
Merge pull request #22634 from arunagw/api-doc-for-actioncable
...
Generate API doc for actioncable
2015-12-17 13:11:26 -02:00
Rafael França
9efb1661ad
Merge pull request #22636 from nateberkopec/fix-dhh-typo
...
Fix typo in thread_mattr_accessor doco [ci skip]
2015-12-17 13:10:51 -02:00
Kasper Timm Hansen
8b66b7bae3
Merge pull request #22635 from arunagw/add-actioncable-to-release-list
...
Add actioncable to list of release frameworks [ci skip]
2015-12-17 16:09:55 +01:00
Nate Berkopec
dee03ae028
Fix typo in thread_mattr_accessor doco [ci skip]
2015-12-17 10:09:36 -05:00
Arun Agrawal
aeceb5d188
Add actioncable to list of release frameworks [ci skip]
2015-12-17 16:08:02 +01:00
Arun Agrawal
5659b86d70
Generate API doc for actioncable
2015-12-17 16:04:46 +01:00
David Heinemeier Hansson
bb4a9e22b0
Merge pull request #22630 from rails/attribute-accessors-per-thread
...
Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread
2015-12-17 15:52:49 +01:00
Rafael França
529d05fed1
Merge pull request #22068 from y-yagi/change_default_to_markdown
...
README.rdoc -> README.md for newly generated plugins
2015-12-17 12:44:13 -02:00
Rafael França
7090192267
Merge pull request #22629 from prathamesh-sonpatki/kill-extra-line-in-manifest-js
...
Kill extra newline at the start of generated manifest.js
2015-12-17 12:42:41 -02:00
Rafael França
ffa26d65a7
Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guide
...
Fix section about ApplicationRecord in upgrading guide [ci skip]
2015-12-17 12:42:04 -02:00
David Heinemeier Hansson
8a40cba66a
Use separate test class name
2015-12-17 15:27:29 +01:00
Xavier Noria
7daad3a401
Update README.md
...
ActiveRecord -> Active Record [ci skip]
2015-12-17 15:00:19 +01:00
Richard Schneeman
76c1c8c57a
Merge pull request #22621 from akshay-vishnoi/add-missing-tests
...
Add missing test cases for asset_path
2015-12-17 07:56:06 -06:00
Prathamesh Sonpatki
f800007c84
Fix section about ApplicationRecord in upgrading guide [ci skip]
2015-12-17 19:07:03 +05:30
David Heinemeier Hansson
b708a6050c
Use consistent references
2015-12-17 14:30:21 +01:00
David Heinemeier Hansson
748b21db8f
Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread
2015-12-17 14:28:19 +01:00
Prathamesh Sonpatki
3ff007ef28
Kill extra newline at the start of generated manifest.js
2015-12-17 18:28:54 +05:30
David Heinemeier Hansson
7a53a9c13c
Puma 2.15.3 actually works fine
2015-12-17 13:34:16 +01:00
yuuji.yaginuma
f34beb52e2
README.rdoc -> README.md for newly generated plugins
...
I think Markdown is nowadays a better default.
2015-12-17 21:24:52 +09:00
David Heinemeier Hansson
47fed8060a
Deal with leading CR when its not a mountable engine
2015-12-17 13:14:31 +01:00
David Heinemeier Hansson
dee118ac0d
Include example of allowed_request_origins
2015-12-17 13:08:58 +01:00
David Heinemeier Hansson
d3962cac2b
Merge pull request #22624 from gsamokovarov/application-record-changelog
...
Pass over the ApplicationRecord changelog entry
2015-12-17 12:17:04 +01:00
David Heinemeier Hansson
1bfce3f29d
Merge pull request #22626 from gsamokovarov/appliation-record-documentation-fixes
...
Appliation record documentation fixes
2015-12-17 12:16:07 +01:00
David Heinemeier Hansson
48f5cecdb0
Merge pull request #22586 from rails/merge-action-cable
...
Merge Action Cable into master
2015-12-17 12:13:22 +01:00
Genadi Samokovarov
4f813a85d8
ApplicationRecord release notes entry
...
[ci skip]
2015-12-17 11:57:41 +01:00
Genadi Samokovarov
c29fbd3c7a
ApplicationRecord documentation pass
...
This is a pass over the documentation which fills the missing gaps of
`ApplicationRecord`.
[ci skip]
2015-12-17 11:56:35 +01:00
David Heinemeier Hansson
d15de0cfb8
Fix tests
2015-12-17 11:49:06 +01:00
David Heinemeier Hansson
7cf856e91f
Don't mount the ActionCable server by default
...
Since we require you to enable it on the client-side, let us do the
same on the server-side. Then you’re not running an EventMachine unless
you need to.
2015-12-17 11:25:05 +01:00
Genadi Samokovarov
008e5ab76d
Pass over the ApplicationRecord changelog entry
...
The changelog entry for ApplicationRecord was a bit confusing. Thank you
guys for helping me get it in a better shape.
[ci skip]
2015-12-17 10:42:53 +01:00
Akshay Vishnoi
21208d2ab0
Add missing test cases for asset_path
2015-12-17 13:07:10 +05:30
Claudio B
c4f8ce53b1
Merge pull request #22619 from akshay-vishnoi/grammar-fixes
...
[ci skip] Fix grammar and sentence framing
2015-12-16 23:34:11 -08:00
Rafael França
0ef5d176b8
Merge pull request #22616 from gfvcastro/test-ruby-2-2-4
...
Test against Ruby 2.2.4 on Travis.
2015-12-17 04:56:45 -02:00
Akshay Vishnoi
ccb6b2e87f
[ci skip] Fix grammar and sentence framing
2015-12-17 12:23:33 +05:30
Rafael França
09f2349e96
Merge pull request #22618 from y-yagi/fix_method_name_typo
...
fix typo in method name [ci skip]
2015-12-17 04:39:57 -02:00
yuuji.yaginuma
dfa51d4ff4
fix typo in method name [ci skip]
...
It was changed by mistake at 428d47adfed8d6aa7b21aec2bf5ad890961c9de3
2015-12-17 13:49:01 +09:00
Rafael Mendonça França
5082cce6e3
Revert "Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_update"
...
This reverts commit 4d06ea9a829de8f6f5a345589828e182eacab6a3, reversing
changes made to e9d15072a94e2ae4dec5b7a121c84a5db38547b8.
Reason: This will break oracle-enhanced, see
3c42131db8/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb (L1254)
2015-12-17 02:07:27 -02:00
Rafael França
4d06ea9a82
Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_update
...
`join_to_delete` is same as `join_to_update`
2015-12-17 02:03:07 -02:00
Ryuta Kamizono
59a030954d
join_to_delete
is same as join_to_update
2015-12-17 12:08:00 +09:00
Gustavo Villa
71f851ed9b
Test against Ruby 2.2.4 on Travis.
2015-12-16 21:24:52 -03:00
Eileen M. Uchitelle
e9d15072a9
Merge pull request #22592 from nwjsmith/disable-logger-message-broadcasts
...
Add Logger option to disable message broadcasts
2015-12-16 18:31:12 -05:00