Permalink
Switch branches/tags
Commits on Nov 10, 2014
  1. 3.2.19.github9

    charliesome committed Nov 10, 2014
  2. Merge pull request #36 from github/3-2-github+ambiguous-times

    Force a period when local times are ambiguous
    charliesome committed Nov 10, 2014
  3. Force a period when local times are ambiguous

    This commit includes the essence of
    rails#17409.
    jbarnette committed with charliesome Nov 9, 2014
Commits on Oct 9, 2014
  1. Merge pull request #34 from github/dbussink/rails32-proc-bind

    Remove Proc#bind from Rails 3.2
    dbussink committed Oct 9, 2014
Commits on Oct 8, 2014
Commits on Oct 7, 2014
  1. 3.2.19.github7

    charliesome committed Oct 7, 2014
  2. 3.2.19.github6

    charliesome committed Oct 7, 2014
Commits on Sep 26, 2014
  1. 3.2.19.github5

    charliesome committed Sep 26, 2014
  2. Move commit exception handling to a method so we can override

    It looks like these methods all get included into the AbstractAdapter,
    and then in github/github we have our own Adapter as an internal gem.
    
    So this should be easy enough to override in our vendor'ed adapter.
    
    This will allow us to still grab errors that happen in `after_commit`
    which would normally be swallowed in Rails 3.0 (and beyond).
    
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
    rsanheim committed with charliesome Jul 1, 2014
  3. only _run_commit_callbacks when destroyed or persisted:

    should fix issues with commit callbacks getting called when the record
    is not persisted (yet) in a inner transaction or due to some other edge
    case.
    
    see also rails@caabed6
    
    Conflicts:
    	activerecord/lib/active_record/transactions.rb
    rsanheim committed with charliesome Jul 12, 2014
  4. 3.2.19.github4

    charliesome committed Sep 26, 2014
  5. Merge pull request #31 from github/3-2-github+json-sessions

    [3.2] JSON sessions
    charliesome committed Sep 26, 2014
  6. ignore nil session["flash"]

    charliesome committed Sep 26, 2014
Commits on Sep 24, 2014
  1. more like 3.2

    gregose committed Sep 24, 2014
  2. update FlashHash for 3.2

    gregose committed Sep 24, 2014
Commits on Sep 23, 2014
  1. support old marshalled cookies

    gregose committed with charliesome Jun 18, 2014
  2. not until 4.0

    gregose committed with charliesome Jun 17, 2014
  3. add flash hash tests

    gregose committed with charliesome Jun 17, 2014
  4. 📗? Update tests and FlashHash cleanup

    * Make FlashHash more like 4.1 (rails@654a2de)
    * Move tests to stringified keys (rails@b97e087)
    * Fix tests to properly load / store to session
    gregose committed with charliesome Jun 17, 2014
Commits on Sep 19, 2014
  1. 3.2.19.github3

    charliesome committed Sep 19, 2014
  2. Merge pull request #30 from github/3-2-github+timezones

    [3.2] Unfuck timezones for db quoting
    charliesome committed Sep 19, 2014