Commit Graph

44239 Commits

Author SHA1 Message Date
Zachary Scott
52871ea05c Merge pull request #15411 from nathany/patch-1
Fix broken link in Rails 3.0 release_notes [ci skip]
2014-05-29 13:16:48 -07:00
Nathan Youngman
4b802bc4f1 Fix broken link in Rails 3.0 release_notes 2014-05-29 14:10:21 -06:00
Yves Senn
f14164c573 Merge pull request #15398 from sgrif/sg-serialized-types
Refactor serialized types to be partially defined as custom properties
2014-05-29 21:53:58 +02:00
Sean Griffin
2eb547a4d9 Refactor serialized types to be partially defined as custom properties
Many of the methods defined in `AttributeMethods::Serialization` can be
refactored onto this type as well, but this is a reasonable small step.
Removes the `Type` class, and the need for `decorate_columns` to handle
serialized types.
2014-05-29 12:12:44 -07:00
Zachary Scott
4584be9b8b Update url to rake docs [ci skip] 2014-05-29 10:17:20 -07:00
Arthur Nogueira Neves
b67e2adaeb Merge pull request #15407 from ShunsukeAida/correct_model_name_example
fixed ActiveModel documentation [ci skip]
2014-05-29 11:28:34 -04:00
ShunsukeAida
33cc907305 Name#model_name doesn't return a String object 2014-05-30 00:09:41 +09:00
Rafael Mendonça França
4a3f71b6fb Merge pull request #15406 from sgrif/sg-column-type-override
Result sets never override a model's column type
2014-05-29 11:23:07 -03:00
Sean Griffin
8eb536e7b4 Result sets never override a model's column type
MySQL and PostgreSQL provide a column type override in order to properly
type cast computed columns included in a result set. This should never
override the known types of full fledged columns. In addition to messing
up computed properties, this would have led to inconsistent behavior
between a record created with `new`, and a record created with `last` on
the mysql adapter in the following cases:

- `tinyint(1)` with `emulate_booleans` set to `false`
- `text`, `string`, `binary`, and `decimal` columns
2014-05-29 07:13:53 -07:00
Matthew Draper
29f8eae3fa Merge pull request #15061 from tgxworld/remove_unnecessary_include
Remove unnecessary include for integration tests.
2014-05-29 21:33:12 +09:30
Yves Senn
159c812b35 Merge pull request #15397 from sgrif/sg-column-class
Ensure we always use instances of the adapter specific column class
2014-05-29 13:13:18 +02:00
Robin Dupret
c0cd7796b4 Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note
[ci skip] Make last note show up in postgresql guide.
2014-05-29 12:33:55 +02:00
Juanito Fatas
29cefc1165 [ci skip] Make last note show up in postgresql guide. 2014-05-29 17:23:59 +08:00
Zachary Scott
3b606a3259 Add missing :param option from the docs for Mapper#match [ci skip]
Option discovered by @zackperdue in #14741, implemented in #5581.
2014-05-29 00:24:06 -07:00
Zachary Scott
d5601041fe Add @senny's changed from #14741, including code font for resources
options, and wrapped to 80 chars. [ci skip]
2014-05-29 00:20:40 -07:00
Zachary Scott
ec7fee4982 Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master 2014-05-29 00:18:52 -07:00
Guillermo Iguaran
03ee41948d Merge pull request #15399 from tgxworld/remove_todo_router_test
Remove TODO.
2014-05-28 22:12:13 -05:00
Zachary Scott
fc63e8074a Use github url for homepage of log4r [ci skip] 2014-05-28 20:06:57 -07:00
Guo Xiang Tan
b1bc553385 Remove TODO. 2014-05-28 20:06:08 -07:00
Sean Griffin
98a7dde064 Ensure we always use instances of the adapter specific column class
- Create a consistent API across adapters for building new columns
- Use it for custom properties so we don't get `UndefinedMethodError`s
  in stuff I'm implementing elsewhere.
2014-05-28 18:23:00 -07:00
Yves Senn
b8be14acdc Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test
Clear inflections after test.
2014-05-29 01:13:17 +02:00
Zachary Scott
c0d1823d54 Fix indentation from 1b4b26f [ci skip] 2014-05-28 15:56:38 -07:00
Zachary Scott
0a3f634e88 Merge pull request #15395 from JuanitoFatas/docs/form-helpers
[ci skip] Improve form_helpers.md guide.
2014-05-28 15:40:26 -07:00
Juanito Fatas
1b4b26f162 [ci skip] Improve form_helpers.md guide. 2014-05-29 06:31:25 +08:00
Aaron Patterson
5bbab5110b add tests for argument error cases 2014-05-28 15:14:49 -07:00
Rafael Mendonça França
d49e1c7552 Merge pull request #15393 from tonytonyjan/patch-2
Fix documentation
2014-05-28 17:15:18 -03:00
簡煒航 (Jian Weihang)
7575f4b9d6 Fix documentation
To prevent `ArgumentError`, `config.action_view.sanitized_allowed_attributes` should be assigned by an array instead of a list.

```
/Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:98:in `do_with_enum': value must be enumerable (ArgumentError)
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:355:in `merge'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/helpers/sanitize_helper.rb:211:in `sanitized_allowed_attributes='
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:26:in `block (3 levels) in <class:Railtie>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `each'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `block (2 levels) in <class:Railtie>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `instance_eval'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `execute_hook'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:28:in `block in on_load'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `each'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `on_load'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:24:in `block in <class:Railtie>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `instance_exec'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `run'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:55:in `block in run_initializers'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:226:in `block in tsort_each'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:348:in `block (2 levels) in each_strongly_connected_component'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:427:in `each_strongly_connected_component_from'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:347:in `block in each_strongly_connected_component'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `call'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each_strongly_connected_component'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:224:in `tsort_each'
	from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:205:in `tsort_each'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:54:in `run_initializers'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/application.rb:288:in `initialize!'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config/environment.rb:5:in `<top (required)>'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `require'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `block in <main>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `instance_eval'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `initialize'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `new'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `<main>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `eval'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `new_from_string'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:40:in `parse_file'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:277:in `build_app_and_options_from_config'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:199:in `app'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:50:in `app'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:314:in `wrapped_app'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:130:in `log_to_stdout'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:67:in `start'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:81:in `block in server'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `tap'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `server'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:40:in `run_command!'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands.rb:17:in `<top (required)>'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `require'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `<top (required)>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `load'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `call'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/command.rb:7:in `call'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client.rb:26:in `run'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/bin/spring:48:in `<top (required)>'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `load'
	from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `<top (required)>'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `require'
	from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `<top (required)>'
	from bin/rails:3:in `load'
	from bin/rails:3:in `<main>'
```
2014-05-29 04:03:23 +08:00
Rafael Mendonça França
37c7774504 Merge pull request #15392 from arthurnn/move_open_transactions
Keep  closer to other methods that touch @transaction
2014-05-28 16:23:56 -03:00
Arthur Neves
709ce3d6a0
Keep closer to other methods that touch @transaction 2014-05-28 15:21:19 -04:00
Rafael Mendonça França
83a437c21e Merge pull request #15390 from sgrif/sg-property-order
Maintain column order when overriding existing columns
2014-05-28 16:10:16 -03:00
Sean Griffin
622021cf18 Maintain column order when overriding existing columns
Working towards re-implementing serialized attributes to use the
properties API exposed the need for this, as serializing a column
shouldn't change the order of the columns.
2014-05-28 12:08:41 -07:00
Rafael Mendonça França
092b92f1bd Merge pull request #15389 from sgrif/sg-property-inheritance
Ensure custom properties work correctly with inheritance
2014-05-28 15:36:16 -03:00
Sean Griffin
c59e01a108 Ensure custom properties work correctly with inheritance 2014-05-28 11:34:20 -07:00
Rafael Mendonça França
fcf9b712b1 Merge pull request #15370 from sgrif/sg-type-namespace
Move types to the top level `ActiveRecord` namespace
2014-05-28 15:22:37 -03:00
Zachary Scott
4ff3fba237 Upgrading Ruby on Rails guide is no longer WIP [ci skip] 2014-05-28 10:44:35 -07:00
Zachary Scott
bfafd0dcec Formatting of content from b1db615 [ci skip] 2014-05-28 10:43:05 -07:00
Zachary Scott
f3e14587a6 Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error
Initial doc for TransactionIsolationError [ci skip]
2014-05-28 10:40:39 -07:00
Yves Senn
99873ca1ea Revert "Merge pull request #12778 from etehtsea/rake-default-fix"
This reverts commit ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd, reversing
changes made to a8bd7b16260c217290ef8fe3a166fcceac442c62.

This reverts commit 555ec36522011862c03b483c53be32410594a51e

This reverts commit 555ec36522011862c03b483c53be32410594a51e

By default, Rails uses the `default` Rake task to run all tests.
This commit changed the environment of the default task to `development`.
This clears the development database and has other negative consequences.
2014-05-28 17:43:45 +02:00
Zuhao Wan
781f8a8a33 Clear inflections after test. 2014-05-28 23:33:10 +08:00
Santiago Pastorino
abd6461e28 Merge pull request #15386 from zuhao/refactor_actionpack_request_forgery_protection_test
Avoid hardcoded `request_forgery_protection_token` value in teardown.
2014-05-28 12:03:50 -03:00
Santiago Pastorino
7fcbc3681e Merge pull request #15387 from sgrif/sg-remove-column-coder
Remove unused `Column#coder`
2014-05-28 12:01:39 -03:00
Santiago Pastorino
9ae3f5ff1c Merge pull request #15388 from zuhao/refactor_actionpack_send_file_test
Unregister Mime::Type in teardown.
2014-05-28 12:00:35 -03:00
Zuhao Wan
35cc73e79d Unregister Mime::Type in teardown. 2014-05-28 22:54:12 +08:00
Sean Griffin
748f070895 Remove unused Column#coder
It appears this property was added, but never actually used. It would be
broken if it were, as it only type casts one way.
2014-05-28 07:48:07 -07:00
Santiago Pastorino
c711c90bae Merge pull request #15385 from zuhao/refactor_actionpack_render_other_test
Add and remove renderer inside the test to prevent leak.
2014-05-28 11:39:11 -03:00
Zuhao Wan
e354b335ce Avoid hardcoded value in teardown. 2014-05-28 22:35:48 +08:00
Zuhao Wan
2ba945253b Add and remove renderer inside the test to prevent leak. 2014-05-28 22:24:22 +08:00
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