Michael Grosser
e401a6bb25
do not override fetch on local cache
...
fetch is supposed to behave differently, this was a mistake merged in
https://github.com/rails/rails/pull/22194
2015-11-07 08:38:01 -08:00
Eileen M. Uchitelle
24bddfc542
Merge pull request #21806 from kachick/fix-transformer-size
...
Return a sized Enumerator from Hash#transform_values{!}
2015-11-07 11:27:17 -05:00
Sean Griffin
986f79a446
Fix test failures
...
The previous commit changes the state of the class, and while we are
cleaning up the database, I forgot to clean up the class
2015-11-07 08:44:29 -07:00
Sean Griffin
9deb6ababe
Ensure #reset_column_information
clears child classes as well
...
I've added a redundant test for this under the attributes API as well,
as that also causes this bug to manifest through public API (and
demonstrates that calling `reset_column_information` on the child
classes would be insufficient)
Since children of a class should always share a table with their parent,
just reloading the schema from the cache should be sufficient here.
`reload_schema_from_cache` should probably become public and
`# :nodoc:`, but I'd rather avoid the git churn here.
Fixes #22057
2015-11-07 08:20:34 -07:00
Richard Schneeman
d238cb88a3
Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guide
...
remove deprecated `:tokenizer` option from guide [ci skip]
2015-11-07 08:21:01 -06:00
Yves Senn
3894fd913f
Merge pull request #22145 from atul-shimpi/master
...
guides, the required option in generators is no longer available.
[ci skip]
2015-11-07 08:55:38 -05:00
yuuji.yaginuma
7b679affe0
remove deprecated :tokenizer
option from guide [ci skip]
...
`:tokenizer` option was deprecated in 1c341eb7cbaeb52435f14c2595e391bfb2e5e38b
2015-11-07 22:31:37 +09:00
Swaathi K
c9143e15a1
Parameterize with options to preserve case of string
...
Added test cases
Using kwargs instead of three seperate functions
Updated parameterize in transliterate.rb
Updated parameterize in transliterate.rb
Added deprecation warnings and updating RDoc+Guide
Misspelled separtor. Fixed.
Deprecated test cases and added support to parameterize with keyword parameters
Squashing commits.
Fixed test cases and added deprecated test cases
Small changes to Gemfile.lock and CHANGELOG
Update Gemfile.lock
2015-11-07 16:57:04 +05:30
Kasper Timm Hansen
af3ac5022e
Merge pull request #22211 from atul-shimpi/master
...
Add comma to to make the information clear
2015-11-07 11:43:26 +01:00
Ubuntu
d2a7b9898b
Add comma to to make the information clear
2015-11-07 10:37:56 +00:00
Kasper Timm Hansen
6158355f2e
Fix wrong assert_equal
argument order.
...
It goes expected, then actual.
Only changed this because the file was just touched (please don't submit pull requests :)).
2015-11-07 11:35:01 +01:00
Kasper Timm Hansen
61e4738c5d
Merge pull request #22207 from yui-knk/suppress_warnings
...
Suppress warning (warning about assigned but unused variable)
2015-11-07 11:30:49 +01:00
yui-knk
f8f0d13aee
Suppress warning (warning about assigned but unused variable)
...
These warings have been appeared from
92bc8cdb07
2015-11-07 17:56:52 +09:00
Richard Schneeman
92bc8cdb07
Merge pull request #21967 from kevinbuch/connection-middleware-mutation
...
Avoid mutating original response in connection management middleware
2015-11-06 16:32:51 -06:00
Kevin Buchanan
2fe4586974
Avoids mutating the original response in connection management middleware
2015-11-06 16:14:24 -06:00
Eileen M. Uchitelle
79d310fbd3
Merge pull request #22203 from cllns/guides-has-many-through-join-models
...
Clarify automatic creation/deletion of join models for has_many through
2015-11-06 16:40:16 -05:00
Eileen M. Uchitelle
f036eacd6c
Merge pull request #22193 from grosser/grosser/multi
...
call local_cache 1 time instead of 3 times
2015-11-06 15:56:01 -05:00
Kasper Timm Hansen
ebe4e9b17c
Merge pull request #22200 from grosser/grosser/prepend
...
use prepend instead of extending every instance
2015-11-06 21:52:28 +01:00
Michael Grosser
894336a23f
use prepend instead of extending every instance
...
extending an instance with a module puts the methods on top of it,
prepend does the same but on the class level, so less work for us and more standard way of doing things
2015-11-06 12:16:28 -08:00
Sean Collins
0aea9289f2
Clarify automatic creation/deletion of join models for has_many through
...
[ci-skip]
2015-11-06 12:19:57 -07:00
Michael Grosser
2c42404330
call local_cache 1 time instead of 3 times
...
LocalCache read_entry previously called the local_cache method 3 times,
now it only calls it once and keeps the result in a local variable.
2015-11-06 08:27:33 -08:00
Sean Griffin
cb67c81933
Merge pull request #22194 from grosser/grosser/read-nil
...
cache nil replies from backend cache so misses are fast too
2015-11-05 19:21:13 -07:00
Michael Grosser
b9fb0f2623
cache nil replies from backend cache so misses are fast too
2015-11-05 17:47:40 -08:00
Yves Senn
9b663e2679
Merge pull request #22150 from raq929/patch-1
...
Update association_basics.md [ci skip]
2015-11-05 16:01:19 -05:00
Kasper Timm Hansen
e262b2d01c
[ci skip] ( ͡° ͜ʖ ͡°) ( ͡⊙ ͜ʖ ͡⊙) ( ͡◉ ͜ʖ ͡◉) javascript => JavaScript
...
JavaScript is spelled with a capital J and S.
2015-11-05 21:31:46 +01:00
Kasper Timm Hansen
c453f9cdb0
[ci skip] Remove final mentions of static_cache_control
in docs.
...
It was deprecated in https://github.com/rails/rails/pull/19135 .
We're now favoring `public_file_server.headers`.
2015-11-05 21:27:29 +01:00
Andrew White
9cec43ca91
Merge pull request #22187 from kamipo/test_binary_data_is_not_logged_is_for_prepared_statements
...
`test_binary_data_is_not_logged` is for prepared statements logging
2015-11-05 19:44:50 +00:00
Yves Senn
b2e1b514b2
Merge pull request #22189 from kamipo/no_need_mysql_doubles_reset_column_information
...
No need `MysqlDouble` and `MysqlDouble.reset_column_information`
2015-11-05 10:05:16 -05:00
Kasper Timm Hansen
175992285b
Merge pull request #22191 from jonatack/fix-static-cache-control-deprecation-warning
...
Fix `static_cache_control` deprecation warning
2015-11-05 13:56:43 +01:00
Jon Atack
8fee1515f6
Fix static_cache_control
deprecation warning
...
1. Fix the message by wrapping the value in missing quotes and adding
the missing backtick at the end. Finally, 💄 by adding a space
inside the curly braces.
Before:
`config.public_file_server.headers = {'Cache-Control' => public,
max-age=31536000}
Now:
`config.public_file_server.headers = { 'Cache-Control' => 'public,
max-age=31536000' }`
2. Display `static_cache_control` instead of static_cache_control. This
follows what the 2 neighboring methods are doing.
3. Use strip_heredoc to improve the code formatting and readability
like the 2 neighboring methods and wrap to 80 characters.
2015-11-05 12:14:09 +01:00
Ryuta Kamizono
c723bca93a
No need MysqlDouble
and MysqlDouble.reset_column_information
2015-11-05 18:19:44 +09:00
Ryuta Kamizono
948b6dd91b
test_binary_data_is_not_logged
is for prepared statements logging
2015-11-05 17:39:53 +09:00
Rafael Mendonça França
175515ad8b
Require the count_down_latch
2015-11-05 02:32:57 -02:00
Rafael França
0ae22e5d8d
Merge pull request #22185 from jdantonio/cr-load-time
...
Require only necessary concurrent-ruby classes.
2015-11-05 02:11:02 -02:00
Rafael Mendonça França
6cb1b6724c
Remove links to docrails
...
docrails is a private repository now to avoid pull requests to it.
2015-11-05 01:22:31 -02:00
Rafael Mendonça França
89b7396191
Add bundle check to release task
2015-11-05 01:04:07 -02:00
Jerry D'Antonio
23b6f65fd1
Require only necessary concurrent-ruby classes.
2015-11-04 21:12:28 -05:00
Yves Senn
23bb31b158
tests, test should not care wether 9ms or 11ms have passed.
...
This solves:
```
Expected /Completed 200 OK in [\d]ms/ to match "Completed 200 OK in 943ms".
```
2015-11-04 16:42:27 -05:00
Kasper Timm Hansen
b7f547e64a
Replace serve_static_files
mentions in docs.
...
Should use `public_file_server.enabled` instead.
Clarified that static files will be served from the public directory, where it made sense.
Also removed occurrence of the deprecated `static_cache_control`.
2015-11-04 22:40:58 +01:00
Kasper Timm Hansen
fa2c96b3f7
Replace serve_static_files
in tests with public_file_server.enabled
.
...
Forgot to do it in 748b2f9, when deprecating `serve_static_files`.
2015-11-04 22:40:58 +01:00
Yves Senn
a80fb6f9b3
tests, define Rails.root
before loading Action Mailer.
...
Since `bin/test` would define `Rails.root` before loading AM but `bundle
exec rake` would define it after loading AM, this lead to the following
test failure when using `bin/test`:
```
--- expected
+++ actual
@@ -1 +1 @@
-{:location=>"/var/folders/_r/9kh50y4j0vn7zgg2p65z1lcm0000gn/T/mails"}
+{:location=>"/Users/senny/Projects/rails/actionmailer/tmp/mails"}
```
This patch ensures that `Rails.root` is defined when loading AM to
achieve consistent test results.
2015-11-04 16:35:31 -05:00
Kasper Timm Hansen
7b471dbf5b
Merge pull request #22173 from kaspth/enable-public-file-server
...
Add enabled flag to the public file server settings.
2015-11-04 22:13:34 +01:00
Kasper Timm Hansen
a3e05f7c81
Move static_cache_contorl
deprecation changelog entry to Railties.
...
The configuration for `config.static_cache_control`, and its replacement
`config.public_file_server.headers` are implemented in Railties.
People would configure this in environment files, which is Railties domain too.
2015-11-04 22:07:45 +01:00
Rafael França
110e49179c
Merge pull request #22182 from seanlinsley/patch-1
...
document `try!` in ActiveSupport core ext guide
2015-11-04 18:55:18 -02:00
Sean Linsley
04bf3a174e
document try!
in ActiveSupport core ext guide
...
https://twitter.com/avdi/status/660141673993777156
2015-11-04 13:27:48 -06:00
Rafael França
e8b2c0535c
Merge pull request #22180 from usertesting/arbitrary-url-in-link-to-back
...
Don’t allow arbitrary data in back urls
2015-11-04 16:12:54 -02:00
Yves Senn
1e2f6bccc8
formatting pass over Active Record changelog. [ci skip]
2015-11-04 12:02:37 -05:00
Yves Senn
3f53df74d7
Merge pull request #22174 from metaskills/defsetup
...
Update docs/comments to use setup/teardown blocks vs. methods. [ci skip]
2015-11-04 11:20:19 -05:00
Ken Collins
91f5adf03a
Update docs/comments to use setup/teardown blocks vs. methods.
...
* Remove super for setup block. Not needed.
2015-11-04 11:15:51 -05:00
Andrew White
e38aa9d746
Remove incorrect comments
...
Columns are no longer stored in an attribute since b8a533d.
[ci skip]
2015-11-04 15:13:02 +00:00