Yves Senn
b22b188223
Merge pull request #15383 from zuhao/refactor_actionpack_localized_templates_test
...
Move I18n.locale setting into setup and teardown.
2014-05-28 16:00:32 +02:00
Zuhao Wan
1407315423
Move I18n.locale setting into setup and teardown.
2014-05-28 21:50:30 +08:00
Yves Senn
0f80a52629
Merge pull request #15381 from zuhao/refactor_actionpack_content_type_test
...
Add with_default_charset helper.
2014-05-28 15:50:24 +02:00
Zuhao Wan
51dc7c2adb
Add with_default_charset helper.
2014-05-28 21:17:16 +08:00
Yves Senn
bdbf00dc78
pg, keep hstore
and json
attributes as Hash
in @attributes.
...
The solution presented in this patch is not efficient. We should replace it
in the near future. The following needs to be worked out:
* Is `@attributes` storing the Ruby or SQL representation?
* `cacheable_column?` is broken but `hstore` and `json` rely on that behavior
Refs #15369 .
/cc @sgrif @rafaelfranca
2014-05-28 13:35:02 +02:00
Rafael Mendonça França
7f73b9152c
Merge pull request #15374 from sgrif/sg-private-properties
...
Remove AR Properties from the public API
2014-05-27 19:38:54 -03:00
Sean Griffin
aff73e0946
Remove AR Properties from the public API
...
Making this part of the public API was premature, let's make it private
again while I continue to work on the surrounding code.
2014-05-27 15:34:23 -07:00
Rafael Mendonça França
c352e064bc
Add CHANGELOG entry for #15269 [ci skip]
2014-05-27 19:29:10 -03:00
Rafael Mendonça França
be4b3df8bb
Merge pull request #15269 from arunagw/aa-fixes-8930
...
rake railties:install:migrations respects the order of railties
2014-05-27 19:27:40 -03:00
Rafael Mendonça França
d0a99c8b26
Merge pull request #15373 from akshay-vishnoi/test-cases
...
Add test case for clear mappings
2014-05-27 19:13:58 -03:00
Rafael Mendonça França
6c5f43bab8
Deprecate all *_filter callbacks in favor of *_action callbacks
...
This is the continuation of the work started at
9d62e04838f01f5589fa50b0baa480d60c815e2c
2014-05-27 19:10:14 -03:00
Akshay Vishnoi
fccb752300
Add test case for clear mappings
2014-05-28 03:37:48 +05:30
Aaron Patterson
cd037783b0
rm dead code
2014-05-27 14:52:59 -07:00
Aaron Patterson
2ffa126f79
PARAMETERS_KEY is only used in the request, so move the constant there
2014-05-27 14:46:04 -07:00
Aaron Patterson
cfdab77d1f
Merge branch 'constraints'
...
* constraints:
rm reset_parameters because we automatically do it from 9ca4839a
move path_parameter encoding check to the request object
dispatcher doesn't need `call` anymore
call `serve` with the request on dispatchers
constraints class does not need the request class anymore
give all endpoints a superclass
skip the build business if the stack is empty
stop hardcoding path_parameters and get it from the request
we do not need to cache rack_app
a redirect is not a dispatcher by definition, so eliminate test
push is_a check up to where the Constraints object is allocated
pass the request object to the application
pass a request to `matches?` so we can avoid creating excess requests
nothing is passed to `rack_app` anymore, so rm the params
one fewer is_a check
Constraints#app should never return another Constraints object, so switch to if statement
eliminate dispatcher is_a checks
push is_a?(Dispatcher) check in to one place
Always construct route objects with Constraint objects
Conflicts:
actionpack/lib/action_controller/metal.rb
2014-05-27 14:40:55 -07:00
Aaron Patterson
406b1b6464
rm reset_parameters because we automatically do it from 9ca4839a
2014-05-27 14:24:30 -07:00
Aaron Patterson
4797c4caca
move path_parameter encoding check to the request object
2014-05-27 14:01:30 -07:00
Aaron Patterson
97a52283f8
dispatcher doesn't need call
anymore
2014-05-27 13:54:59 -07:00
Aaron Patterson
9ad01d0ade
call serve
with the request on dispatchers
2014-05-27 13:51:58 -07:00
Aaron Patterson
7fe14432d8
constraints class does not need the request class anymore
2014-05-27 13:44:58 -07:00
Rafael Mendonça França
babcd7d375
Merge pull request #15372 from akshay-vishnoi/test-cases
...
Test Case - Change method name
2014-05-27 17:18:31 -03:00
Akshay Vishnoi
5c22db25aa
Test Case - Change method name
2014-05-28 01:46:19 +05:30
Aaron Patterson
402c2af550
give all endpoints a superclass
2014-05-27 12:10:24 -07:00
Rafael Mendonça França
d5c315d8d4
Merge pull request #15371 from sgrif/sg-silence-deprecation-warning
...
Silence deprecation warning in test
2014-05-27 15:16:10 -03:00
Sean Griffin
61ef04cec0
Silence deprecation warning in test
...
Missed a case that only occured for mysql/mysql2
2014-05-27 11:12:44 -07:00
Matthew Draper
086ee1cc13
Merge pull request #12080 from ShayDavidson/fix_datetime_partial_dates
...
Added partial days support to `DateTime`'s `advance` method.
2014-05-28 03:32:21 +09:30
Santiago Pastorino
6f9aff75a5
Merge pull request #15321 from tgxworld/only_find_routes_as_heads_for_head_request
...
Call get_routes_as_head only on HEAD requests.
2014-05-27 14:46:49 -03:00
Rafael Mendonça França
0bef6ff9af
Require active_support at the railties
...
Railties need to be used without having to require any dependecy first.
2014-05-27 14:39:24 -03:00
Aaron Patterson
85bfb08c1a
Merge pull request #14834 from al2o3cr/issue14155
...
Correctly alias table names when joining more than once
2014-05-27 10:29:59 -07:00
Rafael Mendonça França
52434e9a51
Merge pull request #15295 from sgrif/sg-deprecate-decimals
...
Deprecate decimal columns being automatically treated as integers
2014-05-27 11:28:00 -03:00
Arun Agrawal
50de394cc8
rake railties:install:migrations respects the order of railties
...
This PR fixes #8930 and some stuff from #8985
2014-05-27 16:12:36 +02:00
Rafael Mendonça França
3067aee91f
Merge pull request #15358 from arthurnn/redefine_habtm_fix
...
Fix redefine a has_and_belongs_to_many inside inherited class
2014-05-27 10:34:32 -03:00
Yves Senn
cd5918f78c
Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym
...
remove unwanted `to_sym` call.
2014-05-27 14:53:48 +02:00
Sean Griffin
6b46106d65
Deprecate decimal columns being automatically treated as integers
...
With ActiveRecord::Properties, we now have a reasonable path for users
to continue to keep this behavior if they want it. This is an edge case
that has added a lot of complexity to the code base.
2014-05-27 05:42:45 -07:00
Yves Senn
83cb356093
Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotes
...
Replace double quotes with single quotes while adding an entry into Gemfile
2014-05-27 09:27:36 +02:00
Yves Senn
9f8ee29e6f
Merge pull request #15356 from deeeki/activesupport_loading
...
Remove `require 'active_support'` from individual modules
2014-05-27 09:08:22 +02:00
Arthur Neves
8570f9391d
Fix redefine a has_and_belongs_to_many inside inherited class
...
After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how
has_an_belongs_to_many used to work, we start raising an error when
redefining the same has_an_belongs_to_many association. This commits fix
that regression.
[Fixes #14983 ]
2014-05-27 00:23:33 -04:00
deeeki
1686c9a5f6
Remove require 'active_support'
from individual modules
...
Let users require `active_support` before loading any ActiveSupport modules
http://guides.rubyonrails.org/active_support_core_extensions.html
2014-05-27 12:48:33 +09:00
Zachary Scott
0bdfb4d166
Fix syntax error from 5eae77c
2014-05-26 20:19:37 -07:00
Rafael Mendonça França
5eae77c44b
Move test to the proper file
...
All preload tests are in the eager_test file
2014-05-26 23:50:49 -03:00
Rafael Mendonça França
a335e10347
Add test case for b13d260
2014-05-26 23:49:04 -03:00
Rafael Mendonça França
5462ffa08e
Merge pull request #15301 from zzak/issue_15212
...
Skip if the association was already loaded.
2014-05-26 23:40:38 -03:00
Rafael Mendonça França
08f57dbc8d
Merge pull request #15353 from sgrif/sg-mysql-condition
...
Remove unnecessary branch from quoting in Mysql
2014-05-26 22:57:07 -03:00
Zachary Scott
5c5fa70459
Typo in AR CHANGELOG [ci skip]
2014-05-26 18:34:53 -07:00
Aaron Patterson
40514aa23a
skip the build business if the stack is empty
2014-05-26 17:30:17 -07:00
Aaron Patterson
02a9401d78
stop hardcoding path_parameters and get it from the request
2014-05-26 17:19:54 -07:00
Rafael Mendonça França
7f1e5504ab
Merge pull request #15284 from sgrif/sg-properties
...
Add a public API to allow users to specify column types
2014-05-26 20:53:29 -03:00
Zachary Scott
415ba0c323
Pass through AM documentation re: 02d048d [ci skip]
2014-05-26 16:45:50 -07:00
Sean Griffin
1a3e739dbe
Remove unnecessary branch from quoting in Mysql
...
This is already the behavior for `BigDecimal` in the abstract adapter.
2014-05-26 16:40:18 -07:00
Zachary Scott
02d048d926
Use "Action Mailer" as canonical name in documentation [ci skip]
...
See also:
3a297f8db7 (commitcomment-6451708)
2014-05-26 16:38:44 -07:00