Aaron Patterson
aaaff369da
cache protocol on the stack to reduce options hash lookups
2014-06-11 11:36:50 -07:00
Aaron Patterson
1c432d1af1
eliminate nil checks in normalize_port
2014-06-11 11:33:36 -07:00
Aaron Patterson
a6f30bea06
reduce hash lookups and disconnect normalize_port from the options hash
2014-06-11 11:33:35 -07:00
Zachary Scott
eec571f992
Merge pull request #15646 from aditya-kapoor/correct-conversion-docs
...
[ci skip] correct docs for conversion
2014-06-11 11:32:50 -07:00
Aditya Kapoor
bb075e3839
[ci skip] correct docs for conversion
2014-06-11 23:29:23 +05:30
Rafael Mendonça França
0a77b467b4
Merge pull request #15644 from akshay-vishnoi/activesupport
...
No need to require to_param, it is already required in object/to_query.rb
2014-06-11 14:56:27 -03:00
Akshay Vishnoi
ccdd97662e
No need to require to_param, it is already required in to_query.rb
2014-06-11 23:23:00 +05:30
Rafael Mendonça França
e0063270c2
Merge pull request #15643 from aditya-kapoor/add-test
...
[ci skip] add test for ActionModel::Conversion
2014-06-11 14:51:45 -03:00
Aditya Kapoor
2399207789
[ci skip] add tests for ActionModel::Conversion
2014-06-11 23:18:47 +05:30
Rafael Mendonça França
b6d3fa1300
Merge pull request #15642 from akshay-vishnoi/activesupport
...
Move tests for blank.rb under Object
2014-06-11 14:26:58 -03:00
Akshay Vishnoi
5505131cc1
Move test for blank.rb under object
2014-06-11 22:53:05 +05:30
Rafael Mendonça França
f3b87be3bb
Merge pull request #15582 from sgrif/sg-timestamps
...
Refactor determination of max updated timestamp
2014-06-11 13:50:38 -03:00
Matthew Draper
e520339104
Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraints
...
begin refactoring add_constraints by moving join keys
2014-06-12 01:52:15 +09:30
Rafael Mendonça França
70b931f846
Merge pull request #15429 from sgrif/sg-rm-cached-attributes
...
rm cached attributes
2014-06-11 12:54:58 -03:00
Rafael Mendonça França
321f25f90f
Merge pull request #15641 from arthurnn/small_doc_add
...
Add has_one? docs
2014-06-11 12:52:39 -03:00
Arthur Neves
4a15c53de4
Add has_one? docs [skip ci]
2014-06-11 11:27:31 -04:00
Yves Senn
47baab0c41
Merge pull request #15628 from akshay-vishnoi/test-cases
...
Add test cases for #in? and #presence_in
2014-06-11 17:25:36 +02:00
Santiago Pastorino
cd7cd9b947
Merge pull request #15637 from akshay-vishnoi/delete-deprecated-method
...
Remove deprecation warning
2014-06-11 11:42:23 -03:00
Rafael Mendonça França
ea3455d81b
Merge pull request #15638 from sgrif/sg-column-types
...
Ensure `column_types` returns a type object, and not a column
2014-06-11 11:23:26 -03:00
Rafael Mendonça França
08edb3ddb1
Merge pull request #15639 from sgrif/sg-column-serialization
...
Remove YAML serialization workaround for columns
2014-06-11 11:21:37 -03:00
Sean Griffin
66736c8e50
rm cached attributes
...
The original patch that added this concept can be found
[here](https://web.archive.org/web/20090601022739/http://dev.rubyonrails.org/ticket/9767 ).
The current default behavior is to cache everything except serialized
columns, unless the user specified otherwise. If anyone were to specify
otherwise, many types would actually be completely broken. Still, the
method is left in place with a deprecation warning in case anyone is
actually still calling this method.
2014-06-11 08:01:33 -06:00
Sean Griffin
4a2be83a7b
Remove YAML serialization workaround for columns
...
We are no longer including column objects in YAML serialization, thanks
to https://github.com/rails/rails/pull/15621
2014-06-11 07:59:29 -06:00
Sean Griffin
09dd29e4f7
Ensure column_types
returns a type object, and not a column
2014-06-11 07:54:39 -06:00
Akshay Vishnoi
75e3464e58
Remove deprecation warning
2014-06-11 19:19:46 +05:30
Yves Senn
ef4e0787d7
cleanup, get rid of trailing whitespace. [ci skip]
...
Follow up to #15636 .
/cc @hundredwatt
2014-06-11 13:55:18 +02:00
Yves Senn
b3b0110df7
Merge pull request #15636 from hundredwatt/patch-1
...
Fix Apache Directives [ci skip]
2014-06-11 13:53:28 +02:00
Jason Nochlin
02ef031341
Fix Apache Directives [ci skip]
...
Directives need to be placed on their own lines in order to work. Tested on: `Server version: Apache/2.2.22 (Ubuntu); Server built: Mar 19 2014 21:11:15`
2014-06-11 07:01:42 -04:00
Vijay Dev
4aa25d4c76
fix typo in changelog [ci skip]
2014-06-11 15:01:28 +05:30
Yves Senn
daaf62c16b
Merge pull request #15635 from kuldeepaggarwal/add-missing-changelog
...
add missing changelog entry. refer [#16db90d] [ci skip]
2014-06-11 09:05:18 +02:00
Kuldeep Aggarwal
aec4127fa1
add missing changelog entry. refer [#16db90d] [ci skip]
2014-06-11 11:38:06 +05:30
eileencodes
5823e42998
begin refactoring add_constraints by moving join keys
...
add_constraints is complicated and difficult to read. This is the
beginning of a long process of refactoring this code. First step:
moved the join keys out of AssociationScope and into reflection.
We then don't need to call `reflection` because now reflection is
`self`.
`foreign_key` must be named something else because reflection already has a
`foreign_key` method and when passed into `JoinKeys` it was getting the
wrong assignment. `reflection_foreign_key` seemed to be an appropriate name.
I also named `key` `reflection_key` to match `reflection_foreign_key`.
2014-06-10 22:08:50 -04:00
Akshay Vishnoi
f648195247
Add test cases for #in? and #presence_in
2014-06-11 06:50:18 +05:30
Aaron Patterson
a5ab38c7bb
remove deprecated code. Rely on describe
provided by minitest
2014-06-10 17:14:57 -07:00
Rafael Mendonça França
80b4fe2c50
Merge pull request #15621 from sgrif/sg-column-type-decorations
...
No need to decorate columns twice
2014-06-10 19:14:37 -03:00
Rafael Mendonça França
57dba02817
Merge pull request #15619 from aditya-kapoor/fix-js-doc
...
[ci skip] Fix doc for javascript_helper
2014-06-10 18:19:25 -03:00
Sean Griffin
da3b4b6173
No need to decorate columns twice
...
We never want result types to override column types, and
`decorate_columns` can only affect column types. No need to go through
the decoration multiple times, we can just exclude the column types from
the result types instead.
2014-06-10 14:52:14 -06:00
Zachary Scott
042f185ccb
Merge pull request #15620 from aditya-kapoor/correct-bundler-link
...
Correct Bundler link [ci skip]
2014-06-10 13:26:50 -07:00
Aditya Kapoor
f651d352eb
Correct Bundler link [ci skip]
2014-06-11 01:45:55 +05:30
Aditya Kapoor
9505a21f42
[ci skip] Fix doc for javascript_helper
2014-06-11 01:29:17 +05:30
Rafael Mendonça França
3c60da761b
Merge pull request #15618 from JuanitoFatas/doc/action-mailer-guide
...
[ci skip] Refine Action Mailer guide.
2014-06-10 16:18:35 -03:00
Juanito Fatas
2e1903822a
[ci skip] Refine Action Mailer guide.
...
* Wrap 80 words if possible.
* Make attachment hash options more readable. (L239-L243)
Before:
![screenshot 2014-06-11 02 59 54](https://cloud.githubusercontent.com/assets/1000669/3235432/a91d0464-f0d2-11e3-9e4a-6af2b2a83f1a.png )
After:
![screenshot 2014-06-11 02 59 36](https://cloud.githubusercontent.com/assets/1000669/3235428/a47b28dc-f0d2-11e3-806c-cfaedd3f15df.png )
* L619 Wrap "location" in code: `"location"`.
* L628 Use actual section name.
* L697 Remove unnecessary `./` when refer to other guide.
2014-06-11 03:13:10 +08:00
Rafael Mendonça França
98575c6bbb
Merge pull request #15617 from kuldeepaggarwal/remove-deprecate-method
...
remove deprecation call while initializing `ClassCache` object
2014-06-10 15:44:48 -03:00
Kuldeep Aggarwal
16db90d13f
remove deprecation call while initializing ClassCache
object
2014-06-11 00:08:19 +05:30
Rafael Mendonça França
6cef56ffac
Merge pull request #15616 from apanzerj/fix_long_key_paths
...
fix error with long keys in ActiveSupport::Cache::FileStore
2014-06-10 15:07:23 -03:00
Rafael Mendonça França
ab98adadf4
Merge pull request #15615 from JuanitoFatas/doc/action-mailer
...
[ci skip] Improve enable_starttls_auto documentation (Action Mailer).
2014-06-10 15:03:33 -03:00
Richard Schneeman
0014bc8bcc
Merge pull request #15614 from akshay-vishnoi/doc_changes
...
[ci skip] Add Docs for strip_insignificant_zeros option in number_to_human
2014-06-10 12:57:10 -05:00
Adam Panzer
9010274627
fix error with long keys in ActiveSupport::Cache::FileStore
2014-06-10 10:53:48 -07:00
Juanito Fatas
6a781b9245
[ci skip] Improve enable_starttls_auto documentation.
2014-06-11 01:51:06 +08:00
Rafael Mendonça França
63e7f07d0d
Merge pull request #15612 from akshay-vishnoi/delete-deprecated-method
...
Remove deprecated method ActiveRecord::Base.quoted_locking_column
2014-06-10 14:49:40 -03:00
Akshay Vishnoi
294ddff512
[ci skip] Add Docs for strip_insignificant_zeros option in number helpers
2014-06-10 23:07:49 +05:30