aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Revert "Merge pull request #12778 from etehtsea/rake-default-fix"Yves Senn2014-05-282-5/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #15386 from ↵Santiago Pastorino2014-05-281-3/+6
|\ \ \ | | | | | | | | | | | | | | | | zuhao/refactor_actionpack_request_forgery_protection_test Avoid hardcoded `request_forgery_protection_token` value in teardown.
| * | | Avoid hardcoded value in teardown.Zuhao Wan2014-05-281-3/+6
| | | |
* | | | Merge pull request #15387 from sgrif/sg-remove-column-coderSantiago Pastorino2014-05-282-34/+1
|\ \ \ \ | | | | | | | | | | Remove unused `Column#coder`
| * | | | Remove unused `Column#coder`Sean Griffin2014-05-282-34/+1
| | |_|/ | |/| | | | | | | | | | | | | | It appears this property was added, but never actually used. It would be broken if it were, as it only type casts one way.
* | | | Merge pull request #15388 from zuhao/refactor_actionpack_send_file_testSantiago Pastorino2014-05-281-2/+6
|\ \ \ \ | | | | | | | | | | Unregister Mime::Type in teardown.
| * | | | Unregister Mime::Type in teardown.Zuhao Wan2014-05-281-2/+6
| | |/ / | |/| |
* | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_testSantiago Pastorino2014-05-281-4/+7
|\ \ \ \ | |/ / / |/| | | Add and remove renderer inside the test to prevent leak.
| * | | Add and remove renderer inside the test to prevent leak.Zuhao Wan2014-05-281-4/+7
| | | |
* | | | Merge pull request #15383 from ↵Yves Senn2014-05-281-10/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | zuhao/refactor_actionpack_localized_templates_test Move I18n.locale setting into setup and teardown.
| * | | Move I18n.locale setting into setup and teardown.Zuhao Wan2014-05-281-10/+8
| | |/ | |/|
* | | Merge pull request #15381 from zuhao/refactor_actionpack_content_type_testYves Senn2014-05-281-12/+20
|\ \ \ | |/ / |/| | Add with_default_charset helper.
| * | Add with_default_charset helper.Zuhao Wan2014-05-281-12/+20
|/ /
* / pg, keep `hstore` and `json` attributes as `Hash` in @attributes.Yves Senn2014-05-285-2/+39
|/ | | | | | | | | | | 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
* Merge pull request #15374 from sgrif/sg-private-propertiesRafael Mendonça França2014-05-2712-30/+12
|\ | | | | Remove AR Properties from the public API
| * Remove AR Properties from the public APISean Griffin2014-05-2712-30/+12
| | | | | | | | | | Making this part of the public API was premature, let's make it private again while I continue to work on the surrounding code.
* | Add CHANGELOG entry for #15269 [ci skip]Rafael Mendonça França2014-05-271-0/+4
| |
* | Merge pull request #15269 from arunagw/aa-fixes-8930Rafael Mendonça França2014-05-273-1/+42
|\ \ | | | | | | rake railties:install:migrations respects the order of railties
| * | rake railties:install:migrations respects the order of railtiesArun Agrawal2014-05-273-1/+42
| | | | | | | | | | | | This PR fixes #8930 and some stuff from #8985
* | | Merge pull request #15373 from akshay-vishnoi/test-casesRafael Mendonça França2014-05-271-0/+10
|\ \ \ | | | | | | | | Add test case for clear mappings
| * | | Add test case for clear mappingsAkshay Vishnoi2014-05-281-0/+10
| | | |
* | | | Deprecate all *_filter callbacks in favor of *_action callbacksRafael Mendonça França2014-05-277-218/+228
| | | | | | | | | | | | | | | | | | | | This is the continuation of the work started at 9d62e04838f01f5589fa50b0baa480d60c815e2c
* | | | rm dead codeAaron Patterson2014-05-271-5/+0
| | | |
* | | | PARAMETERS_KEY is only used in the request, so move the constant thereAaron Patterson2014-05-273-9/+9
| | | |
* | | | Merge branch 'constraints'Aaron Patterson2014-05-2711-75/+85
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | rm reset_parameters because we automatically do it from 9ca4839aAaron Patterson2014-05-273-9/+0
| | | |
| * | | move path_parameter encoding check to the request objectAaron Patterson2014-05-273-18/+13
| | | |
| * | | dispatcher doesn't need `call` anymoreAaron Patterson2014-05-271-4/+0
| | | |
| * | | call `serve` with the request on dispatchersAaron Patterson2014-05-271-9/+10
| | | |
| * | | constraints class does not need the request class anymoreAaron Patterson2014-05-271-4/+4
| | | |
| * | | give all endpoints a superclassAaron Patterson2014-05-274-22/+40
| | | |
| * | | skip the build business if the stack is emptyAaron Patterson2014-05-261-2/+6
| | | |
| * | | stop hardcoding path_parameters and get it from the requestAaron Patterson2014-05-261-1/+2
| | | |
| * | | we do not need to cache rack_appAaron Patterson2014-05-261-9/+3
| | | |
| * | | a redirect is not a dispatcher by definition, so eliminate testAaron Patterson2014-05-261-1/+1
| | | |
| * | | push is_a check up to where the Constraints object is allocatedAaron Patterson2014-05-262-6/+11
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 15:05:08 +0000