Rafael Mendonça França
d8569bd498
Merge pull request #15684 from aditya-kapoor/add-tests-for-assert-valid-keys
...
Add test cases for Hash#asset_valid_keys
2014-06-16 13:27:59 -03:00
Rafael Mendonça França
4dc6b64c54
Merge pull request #13963 from lucas-clemente/pending_migrations
...
Skip migration check if adapter doesn't support it
2014-06-16 13:15:38 -03:00
Yves Senn
92de6d4c35
Merge pull request #15744 from mmozuras/special_keys_set
...
Change Http::Cache::SPECIAL_KEYS from Array to Set
2014-06-16 08:35:00 +02:00
Yves Senn
4ce99ae347
Merge pull request #15743 from tgxworld/remove_unused_parameters
...
Remove unused parameter.
2014-06-16 08:32:59 +02:00
Zachary Scott
01c109a027
Merge pull request #15722 from akshay-vishnoi/spell-correct
...
[ci skip] /mysql/i -> MySQL, Spell correct in continuation to #15555
2014-06-15 22:41:15 -07:00
Zachary Scott
38d4ea7c9a
Merge pull request #15723 from akshay-vishnoi/sql-correction
...
[ci skip] Use `an` for SQL
2014-06-15 22:26:26 -07:00
Rafael Mendonça França
6a25ddd265
Merge pull request #15748 from akshay-vishnoi/activemodel
...
Correct typo, add test for validates_absence_of
2014-06-15 23:53:27 -03:00
Akshay Vishnoi
73dc6d790c
Correct typo, add test for validates_absence_of, correct method names
2014-06-16 08:22:11 +05:30
Mindaugas Mozūras
e312381589
Change Http::Cache::SPECIAL_KEYS from Array to Set
...
Slightly improves performance, for example, a simple benchmark:
```ruby
require 'benchmark/ips'
require 'set'
SPECIAL_KEYS = %w[extras no-cache max-age public must-revalidate]
SPECIAL_KEYS_SET = Set.new(SPECIAL_KEYS)
directive = 'must-revalidate'
Benchmark.ips do |x|
x.report('array') { SPECIAL_KEYS.include?(directive) }
x.report('set') { SPECIAL_KEYS_SET.include?(directive) }
end
```
Output:
```
-------------------------------------
array 67926 i/100ms
set 74054 i/100ms
-------------------------------------
array 2318423.4 (±2.8%) i/s - 11615346 in 5.014899s
set 3387981.8 (±4.7%) i/s - 16958366 in 5.019355s
```
2014-06-15 22:26:15 +03:00
Rafael Mendonça França
952d0f8bdf
Merge pull request #15745 from mmozuras/remove_unused_separators_param
...
Remove unused param 'separators' from RouteSet#build_path
2014-06-15 16:24:34 -03:00
Mindaugas Mozūras
aaa7b6bf2c
Remove unused param 'separators' from RouteSet#build_path
2014-06-15 22:01:34 +03:00
Guo Xiang Tan
70312d224a
Remove unused parameter.
2014-06-15 10:36:46 -07:00
Yves Senn
3268a04e99
Merge pull request #15741 from sgrif/sg-update-deprecation-message
...
Change the deprecation warning on `serialized_attributes`
2014-06-15 16:48:59 +02:00
Sean Griffin
b069ab66d3
Change the deprecation warning on serialized_attributes
...
to "without replacement"
2014-06-15 08:44:58 -06:00
Yves Senn
f59ed560ac
allow preview interceptors to be registered through config.action_mailer
.
...
This was partially broken because `preview_interceptors=` just assigned the
raw values, whithout going through `register_preview_interceptor`. Now the
Action Mailer railtie takes care of the `preview_interceptors` option.
This commit is a partial revert of:
Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base"
This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing
changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be.
/cc @kuldeepaggarwal @y-yagi
2014-06-15 14:17:00 +02:00
Yves Senn
a15704d7f3
Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base
...
[ci skip] correct doc for `register_preview_interceptor`
2014-06-15 12:50:23 +02:00
Yves Senn
1bd12a8609
Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-code
...
remove unnecessary calling of `I18n.backend.store_translations('empty', {})`
2014-06-15 12:44:10 +02:00
Kuldeep Aggarwal
880721434c
remove unnecessary calling of I18n.backend.store_translations(empty, {})
...
Clean up I18n stored translations after test
continuation with #15714
2014-06-15 08:53:58 +05:30
yuuji.yaginuma
71da4b0c79
[ci skip] correct doc for register_preview_interceptor
2014-06-15 09:31:28 +09:00
Yves Senn
247cc2205d
Merge pull request #15737 from kuldeepaggarwal/fix-build
...
reload I18n as we are defining `:ts` locale in `test_number_to_human_with_custom_translation_scope`
2014-06-14 21:52:13 +02:00
Kuldeep Aggarwal
cffbceeb03
reload I18n as we are defining :ts
locale
...
fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913 .
2014-06-15 01:11:13 +05:30
Zachary Scott
fd4bb5af5f
Merge pull request #15735 from aditya-kapoor/update-wiki-md
...
[ci skip] update wiki link for MVC in README
2014-06-14 11:50:14 -07:00
Aditya Kapoor
57fe5fd9b8
[ci skip] update wiki link for MVC
2014-06-15 00:03:01 +05:30
Zachary Scott
2d3cfcc11f
Merge pull request #15734 from aditya-kapoor/correct-link
...
[ci-skip] correct wikipedia MVC link
2014-06-14 11:12:23 -07:00
Godfrey Chan
0ab163d9c6
Edit pass on has_secure_password
documentation [ci skip]
2014-06-14 11:05:39 -07:00
Aditya Kapoor
1505f8b692
[ci-skip] correct wikipedia MVC link
2014-06-14 23:34:08 +05:30
Yves Senn
69807afdd0
Merge pull request #15704 from sgrif/sg-deprecate-serialized
...
Deprecate `serialized_attributes` without replacement
2014-06-14 16:34:58 +02:00
Yves Senn
64220a1de3
Merge pull request #15715 from zuhao/refactor_actionview_cleanup_I18n_translations
...
Clean up I18n stored translations after test.
2014-06-14 16:32:02 +02:00
Yves Senn
5223bad17c
docs, remove getting started guide sample application. [ci skip]
...
This application always gets out of sync and doesn't add much value.
Closes #15721
/cc @rafaelfranca
2014-06-14 16:20:42 +02:00
Eileen M. Uchitelle
b31a576a5e
Merge pull request #15724 from akshay-vishnoi/secure_password_docs
...
[ci skip] Update #has_secure_password docs
2014-06-14 10:18:02 -04:00
Akshay Vishnoi
fb48fccc25
[ci skip] Update #has_secure_password docs
2014-06-14 19:18:24 +05:30
Sean Griffin
2df1540143
Deprecate serialized_attributes
without replacement
...
We've stopped using it internally, in favor of polymorphism. So should
you!
2014-06-14 06:21:28 -06:00
Akshay Vishnoi
513c69c7e1
[ci skip] Use an
for SQL
2014-06-14 17:18:48 +05:30
Akshay Vishnoi
889e65e3fa
/mysql/i -> MySQL, Spell correct in continuation to #15555
2014-06-14 17:11:08 +05:30
Godfrey Chan
34221cdcab
Merge pull request #15717 from akshay-vishnoi/test-cases
...
Use `@existing_user` while updating existing user, fixing - ee4e86
2014-06-14 02:41:49 -07:00
Yves Senn
eb87074e0b
pg guide, use the term database views
to be specific. [ci skip]
2014-06-14 11:20:58 +02:00
Akshay Vishnoi
9bc91260ac
Use @existing_user
while updating existing user, fixing - #ee4e86
2014-06-14 14:42:52 +05:30
Yves Senn
534e1e1f53
Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test
...
Avoid hard-coded value in test setup and teardown.
2014-06-14 11:09:33 +02:00
Aditya Kapoor
fedb16ae12
Add test cases for Hash#asset_valid_keys
2014-06-14 14:13:06 +05:30
Zuhao Wan
48d118573d
Clean up I18n stored translations after test.
2014-06-14 16:36:53 +08:00
Zuhao Wan
0da1c80a99
Avoid hard-coded value in test setup and teardown.
2014-06-14 16:12:44 +08:00
Matthew Draper
a041107bf5
Merge pull request #15710 from zuhao/refactor_actionview_digestor_test
...
Make sure restoration always happen.
2014-06-14 17:29:04 +09:30
Zuhao Wan
0c58eb02ef
Make sure restoration always happen.
2014-06-14 15:55:52 +08:00
Godfrey Chan
ee4e86fa4b
Cleaned up the has_secure_password
test cases
...
* Grouped the valid test cases in one place
* Make the length of the generated password obvious
* Removed two wrong (copy-and-pasted) test cases
2014-06-14 00:43:47 -07:00
Godfrey Chan
c416bb8729
Added changelog for #15708 [ci skip]
2014-06-14 00:32:31 -07:00
Godfrey Chan
6fa7726f07
Merge pull request #15708 from akshay-vishnoi/secure_password
...
SecurePassword - Validate password must be less than or equal to 72
2014-06-14 00:29:30 -07:00
Akshay Vishnoi
cabbc8f6a5
SecurePassword - Validate password must be less than or equal to 72
...
See #14591 , Reason - BCrypt hash function can handle maximum 72 characters.
2014-06-14 12:35:31 +05:30
Matthew Draper
cf67031546
Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6
...
Fixes #15705 .
2014-06-14 15:09:37 +09:30
Rafael Mendonça França
7244e57de8
Merge pull request #15702 from sgrif/sg-rm-serialized
...
Remove `serialized?` from the type interface
2014-06-13 20:09:45 -03:00
Sean Griffin
f61d975596
Remove serialized?
from the type interface
2014-06-13 17:04:04 -06:00