Permalink
Switch branches/tags
Commits on Jul 16, 2014
  1. fix for 1.9 kwargs syntax

    tenderlove committed Jul 16, 2014
Commits on Jul 15, 2014
  1. Merge branch 'rm-uuid'

    rafaelfranca committed Jul 15, 2014
  2. Move uuid_v5 and uuid_v3 to Digest::UUID

    rafaelfranca committed Jul 15, 2014
    These methods are not random so they should not belings to SecureRandom
    module.
  3. fix warnings

    tenderlove committed Jul 15, 2014
  4. execute a request and check the path_parameters

    tenderlove committed Jul 1, 2014
    This actually runs a request through the system, using the actual
    routing methods as we would use in production, then tests the
    path_parameters set on the request object.  The `recognize_path` method
    isn't actually used in production, so testing what it returns isn't
    useful.
  5. remove useless ivar set

    tenderlove committed Jul 1, 2014
  6. RouteSet should be in charge of constructing the dispather

    tenderlove committed Jul 1, 2014
    Now we can override how requests are dispatched in the routeset object
  7. Merge pull request #16180 from rafaelfranca/rm-dirty

    rafaelfranca committed Jul 15, 2014
    Improve Active Model Dirty API.
  8. Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.

    rafaelfranca committed Jul 15, 2014
    These methods may cause confusion with the `reset_changes` that
    behaves differently
    of them.
    
    Also rename undo_changes to restore_changes to match this new set of
    methods.
  9. Implement required #encode_with

    goddamnhippie committed Jul 15, 2014
    While running the spec `ARCONN=mysql2 ruby -v -Itest
    test/cases/yaml_serialization_test.rb`
    the following warning shows up:
    `implementing to_yaml is deprecated, please implement "encode_with"`
  10. Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes…

    rafaelfranca committed Jul 15, 2014
    …_information
    
    This method name is causing confusion with the `reset_#{attribute}`
    methods. While `reset_name` set the value of the name attribute for the
    previous value the `reset_changes` only discard the changes and previous
    changes.
  11. Merge pull request #16129 from rafaelfranca/config_for

    rafaelfranca committed Jul 15, 2014
    Add Rails::Application#config_for
  12. Add Rails::Application#config_for

    rafaelfranca committed Jul 10, 2014
    This is a convenience for loading configuration for the current Rails
    environment.
  13. Merge branch 'master' of git://github.com/rails/rails

    chancancode committed Jul 15, 2014
    Conflicts:
    	activerecord/CHANGELOG.md
  14. Document the change in `nil` handling for serialized attributes

    chancancode committed Jul 15, 2014
    Also updated the test case to reflect that
  15. Merge pull request #16162 from chancancode/fix_json_coder

    chancancode committed Jul 14, 2014
    Fixed JSON coder when loading NULL from DB
  16. Revert "Revert "Merge pull request #16059 from jenncoop/json-serializ…

    chancancode committed Jul 15, 2014
    …ed-attr""
    
    This reverts commit 6f3c64e.
    
    Conflicts:
    	activerecord/CHANGELOG.md
  17. Merge pull request #15266 from dv/use_counter_cache_for_empty_call

    chancancode committed Jul 15, 2014
    If a counter_cache exists, use it for #empty?
  18. Merge pull request #16142 from andreychernih/extend-server-options

    rafaelfranca committed Jul 15, 2014
    Add ability to extend `rails server` command options parser
  19. Merge pull request #16175 from skorks/log_digestor_as_debug

    rafaelfranca committed Jul 15, 2014
    Log digest as :debug instead of :info