1. 29 5月, 2014 29 次提交
    • E
      implement ActiveRecord::Base#pretty_print + changelog · 35983ea0
      Ethan 提交于
      35983ea0
    • M
      Merge pull request #15061 from tgxworld/remove_unnecessary_include · 29f8eae3
      Matthew Draper 提交于
      Remove unnecessary include for integration tests.
      29f8eae3
    • Y
      Merge pull request #15397 from sgrif/sg-column-class · 159c812b
      Yves Senn 提交于
      Ensure we always use instances of the adapter specific column class
      159c812b
    • R
      Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note · c0cd7796
      Robin Dupret 提交于
      [ci skip] Make last note show up in postgresql guide.
      c0cd7796
    • J
      29cefc11
    • Z
      Add missing `:param` option from the docs for Mapper#match [ci skip] · 3b606a32
      Zachary Scott 提交于
      Option discovered by @zackperdue in #14741, implemented in #5581.
      3b606a32
    • Z
      Add @senny's changed from #14741, including code font for `resources` · d5601041
      Zachary Scott 提交于
      options, and wrapped to 80 chars. [ci skip]
      d5601041
    • Z
    • G
      Merge pull request #15399 from tgxworld/remove_todo_router_test · 03ee4194
      Guillermo Iguaran 提交于
      Remove TODO.
      03ee4194
    • Z
      Use github url for homepage of log4r [ci skip] · fc63e807
      Zachary Scott 提交于
      fc63e807
    • G
      Remove TODO. · b1bc5533
      Guo Xiang Tan 提交于
      b1bc5533
    • S
      Ensure we always use instances of the adapter specific column class · 98a7dde0
      Sean Griffin 提交于
      - 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.
      98a7dde0
    • Y
      Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test · b8be14ac
      Yves Senn 提交于
      Clear inflections after test.
      b8be14ac
    • Z
      Fix indentation from 1b4b26f1 [ci skip] · c0d1823d
      Zachary Scott 提交于
      c0d1823d
    • Z
      Merge pull request #15395 from JuanitoFatas/docs/form-helpers · 0a3f634e
      Zachary Scott 提交于
      [ci skip] Improve form_helpers.md guide.
      0a3f634e
    • J
      [ci skip] Improve form_helpers.md guide. · 1b4b26f1
      Juanito Fatas 提交于
      1b4b26f1
    • A
      add tests for argument error cases · 5bbab511
      Aaron Patterson 提交于
      5bbab511
    • R
      Merge pull request #15393 from tonytonyjan/patch-2 · d49e1c75
      Rafael Mendonça França 提交于
      Fix documentation
      d49e1c75
    • Fix documentation · 7575f4b9
      簡煒航 (Jian Weihang) 提交于
      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>'
      ```
      7575f4b9
    • R
      Merge pull request #15392 from arthurnn/move_open_transactions · 37c77745
      Rafael Mendonça França 提交于
      Keep  closer to other methods that touch @transaction
      37c77745
    • A
      Keep closer to other methods that touch @transaction · 709ce3d6
      Arthur Neves 提交于
      709ce3d6
    • R
      Merge pull request #15390 from sgrif/sg-property-order · 83a437c2
      Rafael Mendonça França 提交于
      Maintain column order when overriding existing columns
      83a437c2
    • S
      Maintain column order when overriding existing columns · 622021cf
      Sean Griffin 提交于
      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.
      622021cf
    • R
      Merge pull request #15389 from sgrif/sg-property-inheritance · 092b92f1
      Rafael Mendonça França 提交于
      Ensure custom properties work correctly with inheritance
      092b92f1
    • S
      c59e01a1
    • R
      Merge pull request #15370 from sgrif/sg-type-namespace · fcf9b712
      Rafael Mendonça França 提交于
      Move types to the top level `ActiveRecord` namespace
      fcf9b712
    • Z
      4ff3fba2
    • Z
      Formatting of content from b1db6154 [ci skip] · bfafd0dc
      Zachary Scott 提交于
      bfafd0dc
    • Z
      Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error · f3e14587
      Zachary Scott 提交于
      Initial doc for TransactionIsolationError [ci skip]
      f3e14587
  2. 28 5月, 2014 11 次提交