Code

Merge PR 170 for Rails 5 Upgrade#2

Code

Merged

nathanbertram merged 10 commits intoprocore:rails4-wioux-recovery-windowprocore/paranoia:rails4-wioux-recovery-windowfrom wioux:rails4wioux/paranoia:rails4Copy head branch name to clipboardAug 16, 2017

+63-5

Commits

Commits on Aug 27, 2014

• Implement :dependent_recovery_window option

  wioux

  committed
  134d053

  Copy full SHA for 134d053

Commits on Aug 28, 2014

• Merge branch 'rails4' of https://github.com/radar/paranoia into rails4

  wioux

  committed
  54a97fe

  Copy full SHA for 54a97fe

Commits on Oct 2, 2014

• Merge upstream/rails4

  wioux

  committed
  97ba772

  Copy full SHA for 97ba772

Commits on Dec 4, 2014

• Create failing test

  Show description for 9d49362
  PatKoperwas

  committed
  9d49362

  Copy full SHA for 9d49362

• Fixes restoring polymorphic has_one relationships

  Show description for 99999dd
  PatKoperwas

  committed
  99999dd

  Copy full SHA for 99999dd

• Merge pull request #1 from PatKoperwas/rails4

  Show description for d4a1f79
  wioux

  committed
  d4a1f79

  Copy full SHA for d4a1f79

• Merge upstream/rails4, fix conflicts

  wioux

  committed
  c8c47b3

  Copy full SHA for c8c47b3

Commits on Jan 16, 2015

• Merge branch 'rails4' of https://github.com/radar/paranoia into rails4

  wioux

  committed
  a64ac77

  Copy full SHA for a64ac77

Commits on Jan 30, 2015

• Merge branch 'rails4' of https://github.com/radar/paranoia into rails4

  wioux

  committed
  54d1b2e

  Copy full SHA for 54d1b2e

Commits on May 8, 2015

• Merge upstream/rails4

  wioux

  committed
  d6a7681

  Copy full SHA for d6a7681