aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #15414 from akshay-vishnoi/doc_changesRafael Mendonça França2014-05-291-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Include ActiveModel::Model in a class instead of inheriting
| * | | | | | | [ci skip] Include ActiveModel::Model in a class instead of inheritingAkshay Vishnoi2014-05-301-2/+3
|/ / / / / / /
* | | | | | | Generated engines don't include bin/rake, fixes #15409 [ci skip]Zachary Scott2014-05-291-5/+5
| | | | | | |
* | | | | | | Merge pull request #15413 from sgrif/sg-i-wish-i-couldRafael Mendonça França2014-05-291-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't reference comments that do not exist
| * | | | | | | Don't reference comments that do not existSean Griffin2014-05-291-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-writeRafael Mendonça França2014-05-296-86/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move `type_cast_for_write` behavior over to the serialized type object
| * | | | | | | Move `type_cast_for_write` behavior over to the serialized type objectSean Griffin2014-05-296-86/+47
|/ / / / / / /
* | | | | | | Add missing period from 4b802bc [ci skip]Zachary Scott2014-05-291-1/+1
| | | | | | |
* | | | | | | Merge pull request #15411 from nathany/patch-1Zachary Scott2014-05-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix broken link in Rails 3.0 release_notes [ci skip]
| * | | | | | | Fix broken link in Rails 3.0 release_notesNathan Youngman2014-05-291-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #15398 from sgrif/sg-serialized-typesYves Senn2014-05-2910-50/+52
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Refactor serialized types to be partially defined as custom properties
| * | | | | | Refactor serialized types to be partially defined as custom propertiesSean Griffin2014-05-2910-50/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Update url to rake docs [ci skip]Zachary Scott2014-05-292-2/+2
| | | | | | |
* | | | | | | Merge pull request #15407 from ShunsukeAida/correct_model_name_exampleArthur Nogueira Neves2014-05-292-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fixed ActiveModel documentation [ci skip]
| * | | | | | Name#model_name doesn't return a String objectShunsukeAida2014-05-302-2/+2
|/ / / / / /
* | | | | | Merge pull request #15406 from sgrif/sg-column-type-overrideRafael Mendonça França2014-05-293-1/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Result sets never override a model's column type
| * | | | | | Result sets never override a model's column typeSean Griffin2014-05-293-1/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #15061 from tgxworld/remove_unnecessary_includeMatthew Draper2014-05-293-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unnecessary include for integration tests.
| * | | | | | Remove unnecessary include for integration tests.Guo Xiang Tan2014-05-113-8/+0
| | | | | | |
* | | | | | | Merge pull request #15397 from sgrif/sg-column-classYves Senn2014-05-295-6/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ensure we always use instances of the adapter specific column class
| * | | | | | | Ensure we always use instances of the adapter specific column classSean Griffin2014-05-285-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | | | | | Merge pull request #15403 from JuanitoFatas/doc/pg-guide-noteRobin Dupret2014-05-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Make last note show up in postgresql guide.
| * | | | | | | | [ci skip] Make last note show up in postgresql guide.Juanito Fatas2014-05-291-1/+1
|/ / / / / / / /
* | | | | | | | Add missing `:param` option from the docs for Mapper#match [ci skip]Zachary Scott2014-05-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option discovered by @zackperdue in #14741, implemented in #5581.
* | | | | | | | Add @senny's changed from #14741, including code font for `resources`Zachary Scott2014-05-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options, and wrapped to 80 chars. [ci skip]
* | | | | | | | Merge branch 'master' of github.com:zackperdue/rails into zackperdue-masterZachary Scott2014-05-291-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Added documentation for the :param option for resourceful routingZack Perdue2014-04-141-0/+19
| | | | | | | | |
* | | | | | | | | Merge pull request #15399 from tgxworld/remove_todo_router_testGuillermo Iguaran2014-05-281-11/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove TODO.
| * | | | | | | | | Remove TODO.Guo Xiang Tan2014-05-281-11/+1
| | | | | | | | | |
* | | | | | | | | | Use github url for homepage of log4r [ci skip]Zachary Scott2014-05-281-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_testYves Senn2014-05-291-7/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Clear inflections after test.
| * | | | | | | | | | Clear inflections after test.Zuhao Wan2014-05-281-7/+19
| | | | | | | | | | |
* | | | | | | | | | | Fix indentation from 1b4b26f [ci skip]Zachary Scott2014-05-281-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #15395 from JuanitoFatas/docs/form-helpersZachary Scott2014-05-281-31/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | [ci skip] Improve form_helpers.md guide.
| * | | | | | | | | | [ci skip] Improve form_helpers.md guide.Juanito Fatas2014-05-291-31/+25
| | | | | | | | | | |
* | | | | | | | | | | add tests for argument error casesAaron Patterson2014-05-281-0/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #15393 from tonytonyjan/patch-2Rafael Mendonça França2014-05-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Fix documentation
| * | | | | | | | | Fix documentation簡煒航 (Jian Weihang)2014-05-291-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>' ```
* | | | | | | | | Merge pull request #15392 from arthurnn/move_open_transactionsRafael Mendonça França2014-05-282-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Keep closer to other methods that touch @transaction
| * | | | | | | | | Keep closer to other methods that touch @transactionArthur Neves2014-05-282-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15390 from sgrif/sg-property-orderRafael Mendonça França2014-05-282-3/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Maintain column order when overriding existing columns
| * | | | | | | | | Maintain column order when overriding existing columnsSean Griffin2014-05-282-3/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge pull request #15389 from sgrif/sg-property-inheritanceRafael Mendonça França2014-05-282-5/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure custom properties work correctly with inheritance
| * | | | | | | | | Ensure custom properties work correctly with inheritanceSean Griffin2014-05-282-5/+26
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15370 from sgrif/sg-type-namespaceRafael Mendonça França2014-05-2841-643/+592
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move types to the top level `ActiveRecord` namespace
| * | | | | | | | | | Move types to the top level `ActiveRecord` namespaceSean Griffin2014-05-2741-643/+592
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::Type::Value` => `ActiveRecord::Type::Value`
* | | | | | | | | | Upgrading Ruby on Rails guide is no longer WIP [ci skip]Zachary Scott2014-05-281-1/+0
| | | | | | | | | |
* | | | | | | | | | Formatting of content from b1db615 [ci skip]Zachary Scott2014-05-281-3/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_errorZachary Scott2014-05-281-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Initial doc for TransactionIsolationError [ci skip]
| * | | | | | | | | | Initial doc for TransactionIsolationError [ci skip]Gaurav Sharma2014-05-281-0/+3
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:44:31 +0000