Commit Graph

60115 Commits

Author SHA1 Message Date
Andrew White
7c848e6dd4 Remove deprecated method alias_method_chain 2016-11-14 11:57:30 +00:00
Andrew White
8e43fc5ace Remove deprecated constant MissingSourceFIle 2016-11-14 11:25:52 +00:00
Andrew White
b93a257186 Remove deprecated Module.qualified_const_get/set/defined? 2016-11-14 08:11:21 +00:00
Andrew White
213f0d63a5 Update CHANGELOG 2016-11-13 23:25:05 +00:00
Andrew White
dadba9ae57 Remove deprecated :prefix option 2016-11-13 23:09:03 +00:00
Andrew White
2ff2b98032 Remove deprecated new_from_hash_copying_default 2016-11-13 23:09:03 +00:00
Andrew White
0e8d297301 Remove deprecated time marshal core_ext file 2016-11-13 23:09:03 +00:00
Andrew White
73b18eccdf Remove deprecated struct core_ext file 2016-11-13 23:09:02 +00:00
Andrew White
2ae41d24b9 Remove deprecated module method_transplanting file 2016-11-13 22:29:18 +00:00
Andrew White
c32ccd837e Remove deprecated local_constants 2016-11-13 22:28:18 +00:00
Andrew White
c9458c74e0 Remove deprecated kernel debugger file 2016-11-13 22:27:52 +00:00
Andrew White
3641cd3f3d Remove deprecated namespaced_key 2016-11-13 22:17:37 +00:00
Andrew White
8b646041be Remove deprecated set_cache_value 2016-11-13 22:16:54 +00:00
Andrew White
efdb785d7f Remove deprecated escape_key 2016-11-13 22:15:45 +00:00
Andrew White
08260c2373 Remove deprecated key_file_path 2016-11-13 22:14:31 +00:00
Andrew White
5b2ea20f56 Minor corrections to #26905 2016-11-13 16:05:17 +00:00
Andrew White
89071400b4 Fix typo in constant reference 2016-11-13 15:59:13 +00:00
Andrew White
60d82fa141 It's a NAN not Infinity 2016-11-13 15:57:42 +00:00
Andrew White
d2890f76d4 Use literal values in assertions
Using the method you're testing to generate expected
values can lead to bugs being masked.
2016-11-13 15:31:05 +00:00
Andrew White
c85d305a67 Merge pull request #26933 from prathamesh-sonpatki/fix-26877
Fix an issue with JSON encoding of "Infinity" and "NaN" values
2016-11-13 14:46:21 +00:00
Andrew White
df63abe6d3 Merge pull request #27024 from vipulnsward/changelog-edits
Changelog edits
2016-11-13 14:09:52 +00:00
Andrew White
0ef5b6c163 Merge pull request #26905 from bogdanvlviv/docs
Add missing `+` around a some literals.
2016-11-13 14:09:30 +00:00
Xavier Noria
d07d1e5966 removes unconventional "then" in case expression 2016-11-13 11:46:51 +01:00
Xavier Noria
58201f7d2e revises style in recent code (of mine)
This alternative case expressions read better for my taste, and look more uniform
in a file where other similar case expressions are used (without dynamic clauses).
2016-11-13 11:46:05 +01:00
Jon Moss
ee7556cb08 Merge pull request #27019 from djpowers/patch-1
Fix spelling in API documentation
2016-11-12 15:18:32 -05:00
Sean Griffin
d2e84fa919 Add test for #25248 2016-11-12 15:10:59 -05:00
Sean Griffin
33d47a09d4 Merge pull request #25248 from bluesh55:features/skip-coffee
Add --skip-coffee generating option
2016-11-12 15:10:28 -05:00
Dave Powers
d5f0bb38f6 Fix spelling in API docs
[ci skip]
2016-11-12 15:06:18 -05:00
Vipul A M
7e7d6ccf34
Changelog edits 2016-11-12 13:14:49 -05:00
Andrew White
78a4aa8d1a Merge pull request #27022 from kamipo/add_nodoc_to_table_structure
Add `:nodoc` to `table_structure`
2016-11-12 17:43:23 +00:00
Xavier Noria
26dd9b26ab significant speedup of AC::Parameters#permit
The current implementation of AC::Parameters#permit builds permitted hashes and
then calls permit! on them.

This filtering is recursive, so we call permit! on terminal branches, but then
ascendants call permit! on themselves when the recursion goes up the stack,
which recurses all the way down again because permit! is recursive itself.
Repeat this for every parent node and you get some scary O-something going on
that I don't even want to compute.

Instead, since the whole point of the permit recursion is to build permitted
hashes along the way and at that point you know you've just come up with a
valid filtered version, you can already switch the toggle on the spot.

I have seen 2x speedups in casual benchmarks with small structures. As the
previous description shows, the difference in performance is going to be a
function of the nesting.

Note that that the involved methods are private and used only by permit.
2016-11-12 12:39:30 +01:00
Ryuta Kamizono
9e214b4010 Add :nodoc to table_structure
Follow up to #27008.

`table_structure` is an internal method so it is better to hide it in
the doc. And alias `table_structure` to `column_definitions` to remove
the duplicated `columns` method in the sqlite3 adapter.
2016-11-12 17:10:10 +09:00
Vipul A M
5647d85440 Merge pull request #27018 from alexanderkustov/alexanderkustov/update-docs-ActionView
better docs for ActionView::ViewPaths#prepend_view_path [ci skip]
2016-11-11 19:17:31 -05:00
Alexander Kustov
6035587164 better docs for ActionView::ViewPaths#prepend_view_path
✂️ extra line
2016-11-12 00:02:31 +00:00
Xavier Noria
df3c1eef11 adds a missing dot [ci skip] 2016-11-11 23:40:09 +01:00
Xavier Noria
e86524c0c5 adds support for arbitrary hashes in strong parameters 2016-11-11 23:31:50 +01:00
Rafael França
a5e933410d Merge pull request #27008 from kirs/new-column-from-field
Refactor column initialization into `new_column_from_field`
2016-11-11 14:08:37 -05:00
Kir Shatrov
3dce96a6b1 Refactor column initialization into new_column_from_field
that accepts results of SHOW FIELDS
2016-11-11 11:02:58 -05:00
Matthew Draper
cac3be6341 Merge pull request #26978 from matthewd/query-cache-pool
Configure query caching (per thread) on the connection pool
2016-11-10 14:18:40 -05:00
Jon Moss
c58083584c Merge pull request #27006 from bogdanvlviv/ar_querying_guide
Update guides/source/active_record_querying.md
2016-11-10 14:12:38 -05:00
bogdanvlviv
25eed41c49 Update guides/source/active_record_querying.md
Add info about updating locking column value

Follow #26050 and #26871

[ci skip]
2016-11-10 20:42:23 +02:00
Rafael França
cd9d6bed1b Merge pull request #26820 from y-yagi/add_bang_merge_to_parameters
add `ActionController::Parameters#merge!`
2016-11-10 11:07:23 -05:00
Akira Matsuda
d7b333469e Mysql2::Client::FOUND_ROWS should be defined in all currently supported versions of mysql2 2016-11-10 16:13:30 +09:00
Rafael França
1b16e4c348 Merge pull request #26988 from Paxa/connection_pool_stat
Add ActiveRecord::Base.connection_pool.stat
2016-11-08 16:13:06 -05:00
Kasper Timm Hansen
bab665f893 [ci skip] Expand context on :cache_hits.
Need to explain the key is only there in certain cases.
2016-11-08 18:52:31 +01:00
Kasper Timm Hansen
398570d218 Merge pull request #26993 from yui-knk/render_collection.action_view
[ci skip] Add `render_collection.action_view` entry to AS instrumenta…
2016-11-08 18:45:02 +01:00
Pavel
35b6898f7c Add ActiveRecord::Base.connection_pool.stat 2016-11-09 01:10:16 +08:00
yui-knk
4582d5766a [ci skip] Add render_collection.action_view entry to AS instrumentation 2016-11-08 20:03:22 +09:00
Rafael França
1de3041e3b Merge pull request #26990 from kirs/upgrade-jruby
Upgrade JRuby to satisfy gemfile
2016-11-07 13:38:42 -05:00
Kir Shatrov
7a7b23f95a Upgrade JRuby to satisfy gemfile 2016-11-07 09:37:49 -08:00