Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mvj3/rails3_acts_as_paranoid
base: 92fcd59382
...
head fork: mvj3/rails3_acts_as_paranoid
compare: 908894323a
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Apr 18, 2010
@goncalossilva goncalossilva revised readme 9bd9b6f
@goncalossilva goncalossilva revised readme 3bcddd9
@goncalossilva goncalossilva revised readme a4eee97
@goncalossilva goncalossilva initial version is complete 9baf28e
Commits on May 29, 2010
maxschulze changed self to self.id 545e6a6
Commits on Jun 23, 2010
maxschulze added callbacks 7e1bb62
Commits on Jun 24, 2010
maxschulze added callbacks 02c5ddf
maxschulze added callbacks bd8cff2
Commits on Sep 07, 2010
@jpemberthy jpemberthy wrapping :destroy callbacks over the paranoid `destroy`. 0ad5c3f
Commits on Sep 11, 2010
@goncalossilva goncalossilva whitespace removal 1d62870
Commits on Sep 12, 2010
@lichtamberg lichtamberg Added inital gemspec-file 5f3f1f8
Commits on Sep 17, 2010
@lichtamberg lichtamberg Changed with_deleted from self.unscoped.where() to self.unscoped.relo…
…ad - tests pass now
e7dd9f5
@goncalossilva goncalossilva changed license's location 7bdf0aa
@goncalossilva goncalossilva added custom rake tasks for development 3e56caf
@goncalossilva goncalossilva improved gemspec 513b01b
@goncalossilva goncalossilva using Bundler for development 9c23c60
Commits on Oct 26, 2010
Brian Underwood Postgres doesn't like checking for the value 'true' in date/time fields ff8ae28
Commits on Oct 27, 2010
@goncalossilva goncalossilva no need to check for != true when showing deleted records. It's eithe…
…r Time/true or nil.
99de309
@goncalossilva goncalossilva fixed missing quotes 2b5cbcc
Commits on Nov 11, 2010
@goncalossilva goncalossilva reverting e7dd9f5 because of performance issues (see issue #9) 5160bf2
Commits on Nov 14, 2010
Brian Underwood Adding ability to do recursive recover 2c2cf7f
Brian Underwood Merge remote branch 'upstream/master'
* upstream/master:
  reverting e7dd9f5 because of performance issues (see issue #9)
  fixed missing quotes
  no need to check for != true when showing deleted records. It's either Time/true or nil.

Conflicts:
	lib/rails3_acts_as_paranoid.rb
cffce48
Commits on Nov 21, 2010
Brian Underwood Adding documentation for recursive recovery and changing some options…
… to be a bit clearer
8a1ffaf
Commits on Dec 07, 2010
@copyhacker copyhacker Added validates_uniqueness_of_without_deleted. e3bfd0b
@copyhacker copyhacker Small refactor 9c60f7f
@copyhacker copyhacker Fixed a load path aabe655
@copyhacker copyhacker Added gemspec and gemfile 425dc68
@copyhacker copyhacker Version bump to keep rubygems.org happy 98af037
@copyhacker copyhacker Fixed gem name in gemfile a6e6892
@copyhacker copyhacker Fix require_paths and bump again (learning...) f86bdb6
@copyhacker copyhacker Fix initialization (more learning...) 2f5df7b
@copyhacker copyhacker Back to original gem name since I'm not using rubygems ATM 8f7c88c
Commits on Dec 09, 2010
Brian Underwood Don't recursively recover if the association isn't paranoid 111347a
Commits on Dec 10, 2010
Brian Underwood Tests for making sure that recover doesn't fail when there are :depen…
…dent => :destroy assocations against non-paranoid models
5713eb4
Commits on Dec 15, 2010
@copyhacker copyhacker Reverted gemspec changes and deleted .gem file. a547865
@copyhacker copyhacker Added documentation for validates_uniqueness_of_without_deleted. 857d15d
Commits on Dec 27, 2010
@goncalossilva goncalossilva paranoid validations triggered by calling validates_as_paranoid db49dec
@goncalossilva goncalossilva version update 05d1890
@goncalossilva goncalossilva Merge branch 'master' of https://github.com/cheerfulstoic/rails3_acts…
…_as_paranoid into cheerfulstoic-master

Conflicts:
	README.markdown
	test/rails3_acts_as_paranoid_test.rb
	test/test_helper.rb
452c264
@goncalossilva goncalossilva version bump f6b5e57
@goncalossilva goncalossilva increased the default recovery time window 7963952
@goncalossilva goncalossilva added appropriate acknowledgements 7830fa6
@goncalossilva goncalossilva ignore Gemfile.lock a4d33a4
Commits on Dec 29, 2010
@filiptepper filiptepper added deleted? method 0516885
Commits on Dec 31, 2010
@filiptepper filiptepper described deleted? helper in README 3a9a45d
Commits on Jan 28, 2011
@misterbojangles misterbojangles enabled validation for records to be recovered d745e56
Commits on Feb 24, 2011
Brian Underwood Check for :delete_all dependencies in addition to :destroy d1d2841
Commits on Feb 25, 2011
@goncalossilva goncalossilva Merge branch 'master' of https://github.com/cheerfulstoic/rails3_acts…
…_as_paranoid into cheerfulstoic-master
d2d8737
@goncalossilva goncalossilva Merge branch 'master' of github.com:goncalossilva/rails3_acts_as_para…
…noid
bfb589e
Commits on Apr 01, 2011
@phene phene Updated gem versions
Renamed is_paranoid? to paranoid? and removed from Object class
Rewrote acts_as_paranoid to include/extend Instance/Class method modules instead of class_eval
Added support for the destroy callback chain w/ tests
6c7956f
Commits on Apr 02, 2011
@goncalossilva goncalossilva renamed deleted_around scope to paranoid_deleted_around_time (less co…
…nflict probability?)
784f469
@goncalossilva goncalossilva added a failing test because of the lack of support for :dependent =>…
… :whatever
a9a75fb
@goncalossilva goncalossilva version bump, updated README 7c09831
@goncalossilva goncalossilva updated caveats 4ca8b52
Commits on Apr 19, 2011
@flah00 flah00 Added support for Active Record STI 5f0fe66
@goncalossilva goncalossilva updated caveats 773165b
@goncalossilva goncalossilva added a failing test (see issue #22) d00870e
@goncalossilva goncalossilva Merge branch 'master' of https://github.com/flah00/rails3_acts_as_par…
…anoid into flah00-v0.0.6

Conflicts:
	Gemfile.lock
ca527c0
@goncalossilva goncalossilva updated README 9fa127b
@goncalossilva goncalossilva ooops 0b4b322
@goncalossilva goncalossilva class instance variables should be set on subclasses of paranoid classes 7b09c64
@goncalossilva goncalossilva version bump 40890a6
Commits on Apr 29, 2011
10to1 Required rubygem version to 1.3.6 (deploy issues) aa0c7eb
Commits on May 22, 2011
@jmoses jmoses Encoding magic comment is 'encoding', not 'coding' daf9c43
@goncalossilva goncalossilva Merge pull request #23 from 10to1/patch-1
Required rubygem version to 1.3.6 (deploy issues)
f4fb9bb
Commits on May 23, 2011
@goncalossilva goncalossilva Merge pull request #25 from jmoses/patch-1
Encoding magic comment changed to 'encoding'
61be6a3
Commits on May 25, 2011
@Overbryd Overbryd Using class_accessor in order to provide inheritable but isolated con…
…figuration attributes for subclasses
b6cfe03
@goncalossilva goncalossilva Merge pull request #26 from Overbryd/master
class << self; attr_accessor :name end is not appropriate
9374a8e
@goncalossilva goncalossilva changed magic comment variant to the one used in Bundler by default 3da75e6
@goncalossilva goncalossilva version bump c8d8469
Commits on Jul 07, 2011
@mvj3 Ensure record is accessible after destroyed 4a22ba2
Commits on Jul 15, 2011
William Howard add new callbacks to active record for recovery of paranoid models aed2f1e
Commits on Jul 16, 2011
@goncalossilva goncalossilva Merge pull request #32 from whoward/add_recovery_callbacks
add new callbacks to active record for recovery of paranoid models
d10ff17
Commits on Jul 18, 2011
William Howard added code to support observation of paranoid models with ActiveRecor…
…d::Observer
f404864
Commits on Aug 11, 2011
@goncalossilva goncalossilva Merge pull request #33 from whoward/add_recovery_callbacks_to_observer
Add support for using ActiveRecord::Observer
8b452e1
@goncalossilva goncalossilva Merge pull request #30 from mvj3/master
Ensure record is accessible after destroyed
5edcb22
Commits on Aug 15, 2011
@goncalossilva goncalossilva Revert "Ensure record is accessible after destroyed"
This reverts commit 4a22ba2.
ac56e17
@goncalossilva goncalossilva Deletion column type can now be a string (thanks to @vikramdhillon fo…
…r the idea and initial implementation!)
57f629b
@goncalossilva goncalossilva Updated README with information on the latest addition: the ability t…
…o have the column type String
fc8fa15
@goncalossilva goncalossilva added vikramdhillon to the README as a contributor 4a3da62
Commits on Aug 16, 2011
@goncalossilva goncalossilva improved handling of dependent relations (fixes #8 and #31) 0164a9a
@goncalossilva goncalossilva Preparing for 0.1 release. 57b6556
Commits on Sep 03, 2011
@goncalossilva goncalossilva return object on destroy() 1d86f31
@goncalossilva goncalossilva force activesupport ~>3.0 7a2adf6
@goncalossilva goncalossilva remove cedilla from gemspec 2e43bec
@goncalossilva goncalossilva updated README since 'dependent' is now available on paranoid models 03aa162
Commits on Sep 12, 2011
@iansheridan iansheridan making sure that the `delete_all` use refers to the user defined ID c…
…olumn name. An issue comes up when you use anything other then `id` for the primary_key column.
92a3f25
@goncalossilva goncalossilva Merge pull request #37 from iansheridan/master
Fixed issue where user uses `set_primary_key` in there model.
8776a06
Commits on Sep 19, 2011
koji Use association.foreign_key istead of association.primary_key_name to…
… avoid a warning below which says

the method would be removed from Rails 3.2.

DEPRECATION WARNING: primary_key_name is deprecated and will be removed from Rails 3.2 (use foreign_key instead). (called from block (2 levels) in <top (required)> at /path/to/myapp/spec/spec_helper.rb:<line_num>

object.destroy! was stated at /path/to/myapp/spec/spec_helper.rb:<line_num>
7c575fa
Commits on Sep 24, 2011
@goncalossilva goncalossilva Merge pull request #39 from codeout/rails31
association.foreign_key instead of association.primary_key_name for future compatibility
655933a
@codeout codeout define foreign_key as an alias of primary_key_name to maintain backwa…
…rd compatibility

Method primary_key_name is now deprecated and the replacement foreign_key is newly
introduced in active_record 3.1.0. While the new method should be used for rails 3.1.x
or later, the old one is still required for rails 3.0.x.
d65de64
@goncalossilva goncalossilva Merge pull request #41 from codeout/rails31
define foreign_key as an alias of primary_key_name to maintain backward compatibility
ad5dc1d
Commits on Sep 28, 2011
@Flink Flink Added to_json on id in instance_eval, to prevent non-numeric primary …
…key from working.
b63a98d
Commits on Oct 03, 2011
@goncalossilva goncalossilva Merge pull request #42 from Flink/master
Added to_json on id in instance_eval, to prevent non-numeric primary key from working.
8d7699e
Commits on Nov 20, 2011
@goncalossilva goncalossilva Fixes #45 84415bb
Commits on Jan 25, 2012
@chuckg chuckg Updated to strictly support Rails 3.2 616ae05
@chuckg chuckg Added ability to chain with_deleted/only_deleted with associations an…
…d through relations.
f159ff4
Commits on Jan 26, 2012
@chuckg chuckg Added testing around destroy/delete_all through relations. 66f15f0
Commits on Feb 15, 2012
@chuckg chuckg Fixed with_deleted/only_deleted incorrectly removing all default_scopes. 8996529
Commits on Feb 16, 2012
@chuckg chuckg Renamed method to remove paranoid default_scope to be more clear. 129570f
@chuckg chuckg delete_all! should not remove all default_scopes, only the paranoid. 016300b
@chuckg chuckg Cleaned up tests around removal through relations.
    * fake removal: destroy/destroy_all
    * real removal: destroy!/delete_all
bcccfea
@chuckg chuckg Added fake/real deletion tests around classes with multiple default s…
…copes.
6ab37f0
Commits on Feb 17, 2012
@chuckg chuckg Added :with_deleted option to belongs_to. 82771cd
Commits on Feb 22, 2012
@chuckg chuckg Reorganized code into disparate files. e116e5a
@chuckg chuckg Added tests around Klass.paranoid? 7dd2c62
@chuckg chuckg validates_as_paranoid plays nicely with other default_scopes when val…
…idating.
b462aaa
Commits on Mar 05, 2012
@chuckg chuckg belongs_to associations using the :with_deleted option will play nice…
…ly with other default scopes.
9fca394
Commits on Mar 06, 2012
@goncalossilva goncalossilva Added .DS_Store to gitignore. e3dcb7b
@softcraft-development softcraft-development Updated gemspec for forked version ede7182
@softcraft-development softcraft-development Moved ParanoidBaseTest to test_helper for easier inclusion in multipl…
…e test files
52f6af8
@softcraft-development softcraft-development Basic instance destroy test 6bd95d5
@softcraft-development softcraft-development Reworked test_helper require 3bfc5ba
@softcraft-development softcraft-development Extended instance delete to be paranoid 43c6b4a
@softcraft-development softcraft-development Added test for class destroy by single id 7e6f372
@softcraft-development softcraft-development Made class deletes by ID paranoid ce4019c
@softcraft-development softcraft-development test for paranoid multiple destroy by id d82b9b3
@softcraft-development softcraft-development test for paranoid multiple delete by id 4917eba
@softcraft-development softcraft-development Test for many:many has_many :through deletion e3f7f7a
@softcraft-development softcraft-development bidirectional many:many clear is paranoid 095ad98
@softcraft-development softcraft-development test finding a deleted model 7a872db
@softcraft-development softcraft-development paranoid deletion of many:many linking object prevents joined object …
…load
9a69545
@softcraft-development softcraft-development switched call from mount_sql_and_params to build_relation
Looks like the method was renamed in rails/rails@a30b440#activerecord/lib/active_record/validations/uniqueness.rb

I Googled up the reference from here: goncalossilva#39
9ffa910
@softcraft-development softcraft-development Switched from string table name to Arel::Table for build_relation
Was getting this exception:

  1) Error:
test_should_validate_without_deleted(ValidatesUniquenessTest):
TypeError: can't convert Symbol into Integer
    /Users/craig/.rvm/gems/ruby-1.9.2-p0@paranoid/gems/activerecord-3.1.3/lib/active_record/validations/uniqueness.rb:65:in `[]'
    /Users/craig/.rvm/gems/ruby-1.9.2-p0@paranoid/gems/activerecord-3.1.3/lib/active_record/validations/uniqueness.rb:65:in `build_relation'
    /Users/craig/Sites/rails3_acts_as_paranoid/lib/validations/uniqueness_without_deleted.rb:13:in `validate_each'
    ...

In addition to the rename, build_relation is now also expecting a Arel::Table.
It then extracts the field using table[attribute].
When table was a String, the dereferencing was expecting an integer array index.
0232af0
@softcraft-development softcraft-development Reworked paranoid deletion for Rails 3.1 a058633
@softcraft-development softcraft-development Added comment to explain the relation recursion 006c6ac
@softcraft-development softcraft-development Compensated for update(id,attributes) requiring array of attributes w…
…hen passing an array of ids
75dc4d1
@softcraft-development softcraft-development Reenabled test for associated object lookup e9a41d0
@softcraft-development softcraft-development associated object destroy no longer destroys the actual object
This matches what a non-paranoid class does
3854d6e
@softcraft-development softcraft-development Reworded assertion failure messages ab0d8ef
@softcraft-development softcraft-development Switched from update to update_all for paranoid deletion
Uniqueness validations were erroneously being called during paranoid
deletions; this bypasses all validations.

Also bypasses the issue with update attributes needing to be cloned
9bebd75
@softcraft-development softcraft-development replaced self-referencing dependency with activerecord d9d2959
@softcraft-development softcraft-development Implemented with_deleted for Relations 1d3d1f1
@goncalossilva goncalossilva Added .DS_Store to gitignore. 6779ff4
@goncalossilva goncalossilva Merge branch 'softcraft-development-master' 24807f6
@goncalossilva goncalossilva Setup autotest. cbf5ec8
@goncalossilva goncalossilva Prepare for release targetting Rails 3.2. 0f9e77e
@goncalossilva goncalossilva Master is a development branch. Change README and gem specification a…
…ccordingly.
e127405
@goncalossilva goncalossilva Add Craig Walker to the acknowledgements list. 0f0aa0d
@goncalossilva goncalossilva Add Craig Walker to the acknowledgements list. 999fa78
Commits on Mar 08, 2012
@chuckg chuckg Fixes an issue with belongs_to :with_deleted incorrectly returning an…
… array.
f303341
@goncalossilva goncalossilva Merge branch 'activerecord/3_2' of https://github.com/chuckg/rails3_a…
…cts_as_paranoid into chuckg-activerecord/3_2

Conflicts:
	Gemfile
	Gemfile.lock
	lib/rails3_acts_as_paranoid.rb
	lib/validations/uniqueness_without_deleted.rb
	rails3_acts_as_paranoid.gemspec
	test/test_helper.rb
bc1fa44
@goncalossilva goncalossilva Update sqlite3 gem name. 2a0c54b
@goncalossilva goncalossilva Hack around a logger bug in ruby 1.8.7. 037aff3
@goncalossilva goncalossilva Removed unnecessary checks. 97cfce4
@goncalossilva goncalossilva Add travis-ci configuration file. 5000cc0
@goncalossilva goncalossilva Considerably simplified logic behind window-based recovery. Removed u…
…nnecessary scope.
0b565e4
@goncalossilva goncalossilva Fix typo in travis-ci configuration. 6b0c5f4
@goncalossilva goncalossilva Move method to the private section. 3f48754
@goncalossilva goncalossilva Updated README. ba99b65
@goncalossilva goncalossilva Merge branch 'activerecord/3_2' of https://github.com/chuckg/rails3_a…
…cts_as_paranoid into chuckg-activerecord/3_2
6ddd598
@goncalossilva goncalossilva Merge branch 'master' into rails3.2
Conflicts:
	Gemfile
	README.markdown
	rails3_acts_as_paranoid.gemspec
3f33da5
@goncalossilva goncalossilva Fix README markup. 1b29edd
@goncalossilva goncalossilva Merge branch 'master' into rails3.2 5c547c5
@goncalossilva goncalossilva Updated README. a8aa755
@goncalossilva goncalossilva Merge branch 'master' into rails3.2 26b177e
@goncalossilva goncalossilva Fix travis-ci JRuby run. 99538ec
@goncalossilva goncalossilva Merge branch 'master' into rails3.2 a394bb7
@chuckg chuckg Adding the `:with_deleted` to a `belongs_to` association does not cre…
…ate two association accessors, you still need to explicitly create one including deleted records and (or one without).
1e3a613
@goncalossilva goncalossilva Merge pull request #56 from chuckg/patch-1
README clarification
696d298
@goncalossilva goncalossilva Add activerecord-jdbcsqlite3-adapter to the Gemfile.lock for JRuby runs. 6378fbf
@goncalossilva goncalossilva Merge branch 'master' into rails3.2 8307a34
@goncalossilva goncalossilva Refactored tests' locations. e4d3676
@chuckg chuckg Refactored code/tests around recursive recovery. 2ddaf9c
@chuckg chuckg Refactored recover_dependant_solutions and supporting methods. d6a898e
@chuckg chuckg deleted_(inside_window|before|after)_time scopes are only available o…
…n paranoid classes that store delete by time
b311451
Commits on Mar 09, 2012
@chuckg chuckg Updated README to include information about additional scopes. a54bc65
@goncalossilva goncalossilva Merge pull request #57 from chuckg/patch-2
Refactored code/tests around recursive recovery
2a856e1
@goncalossilva goncalossilva Separate always unavailable scopes from the not always unavailable sc…
…opes in the README.
b335dc5
Commits on Mar 11, 2012
@goncalossilva goncalossilva Remove version on master. e30344f
@goncalossilva goncalossilva Bump version for release. 1052ae6
Commits on Mar 14, 2012
@chuckg chuckg Added tests around dependant recovery window. 1e0b67d
@chuckg chuckg Reorganize recursive tests. 45a58d8
@chuckg chuckg Added tests around recursive real deletion.
    - Fixes an issue where non-collection based associations would not delete
    their dependent.
7aa4e3c
Commits on Mar 15, 2012
@chuckg chuckg Destroying dependent records should respect other default scopes. 9534dd2
@goncalossilva goncalossilva Merge pull request #59 from chuckg/3_2/dependants
Dependent deletion / recovery tests and fixes
0e2fbb8
@goncalossilva goncalossilva Merge branch 'rails3.2'
Conflicts:
	rails3_acts_as_paranoid.gemspec
9c4ce8f
@goncalossilva goncalossilva Bump version for release. dc1572a
Commits on May 01, 2012
@goncalossilva goncalossilva Update Rails (& related). c9bb41d
@goncalossilva goncalossilva Add failing test for paranoid — not paranoid belongs_to :with_deleted…
… association.
7040c18
@goncalossilva goncalossilva Extend ActiveRecord::Base with paranoid associations. 6c9e955
@goncalossilva goncalossilva Merge branch 'rails3.2'
Conflicts:
	rails3_acts_as_paranoid.gemspec
a80c730
@goncalossilva goncalossilva Fix gemspec. 7bd6d9f
Commits on May 16, 2012
Péricles Dias Fix nil polymorphic, with_deleted, belongs_to
When association is polymorphic and association is not set, finder
should return nil
225b551
Péricles Dias Do not delete :with_deleted from options 5b2d844
Péricles Dias Revert "Do not delete :with_deleted from options"
This reverts commit 5b2d844.
b53ce1e
Péricles Dias Remove rubinius from travis-ci afd57c8
Péricles Dias Add .rvmrc a467e9a
Péricles Dias Keep original options f8fd8ff
Péricles Dias Merge with master ccdddd6
Péricles Dias Revert "Remove rubinius from travis-ci"
This reverts commit afd57c8.
1e69626
Péricles Dias Revert "Add .rvmrc"
This reverts commit a467e9a.
6cabed4
Péricles Dias Merge pull request #1 from pericles/do-not-delete-with_deleted
Do not delete with deleted
77f0d9b
Péricles Dias Fix nil polymorphic belongs_to 49a3df7
Péricles Dias Merge pull request #2 from pericles/fix-nil-polymorphic
Fix nil polymorphic belongs_to
1803e06
Péricles Dias Revert "Keep original options"
This reverts commit f8fd8ff.
2c83ca7
@goncalossilva goncalossilva Fix gemspec for rails3.2. c9ebae0
@goncalossilva goncalossilva Bump version for release. 7f938fb
Péricles Dias Keep original options 09f95b8
@goncalossilva goncalossilva Merge branch 'pericles-keep-with-deleted' into rails3.2 1dda2d4
@goncalossilva goncalossilva Bump version for release. 7efb93d
@goncalossilva goncalossilva Bump version for release. 7cd6522
@goncalossilva goncalossilva Back to dev version. 5f691e7
Commits on Sep 25, 2012
@aake aake Add support for string type with non-nil values when not deleted (the…
…se used to be treated as deleted). #73
51d7759
Commits on Oct 11, 2012
@chuckg chuckg Clean-up README around string based deletion bc7a24c
@chuckg chuckg Merge branch '3.2/column_type_string_non_nil_values' into rails3.2
From issues #73, #81:
Add support for string type with non-nil values when not deleted.
a281e39
@dra1n dra1n Fix sql conditions in tests. b7f02f0
@dra1n dra1n Fix task for running tests. 87adbaa
@chuckg chuckg Merge branch '3.2/fix_tests' into rails3.2
Merges #78 via dra1n
4746980
Commits on Oct 28, 2012
Charles Bergeron Retains the original ActiveRecord behaviour for #persisted? so you ca…
…n still build routes with deleted instances (eg. edit_paranoid_path( paranoid ))
6d37972
Commits on Nov 16, 2012
Tiago Cardoso added support for composite primary keys 7887adf
Tiago Cardoso corrected the uniqueness validation for models with composite primary…
… keys
5a13d9c
Commits on Nov 20, 2012
@adie adie Fixed bug with double `belongs_to :assoc, :with_deleted => true` f0382a8
Commits on Nov 28, 2012
@goncalossilva goncalossilva Merge pull request #86 from adie/rails3.2
Fixed bug with double `belongs_to :assoc, :with_deleted => true`
ddcca61
@goncalossilva goncalossilva Merge pull request #82 from chuckbergeron/fix/activerecord_persisted
Retains the original ActiveRecord behaviour for #persisted? ...
aa0657a
Commits on Dec 09, 2012
@goncalossilva goncalossilva Merge pull request #85 from TiagoCardoso1983/rails3.2
Composite Primary Keys Support
ecf9818
@goncalossilva goncalossilva Whitespace & add a couple of comments 4b54297
@goncalossilva goncalossilva Merge branch 'rails3.2'
Conflicts:
	rails3_acts_as_paranoid.gemspec
cbca2cf
@goncalossilva goncalossilva Update gemspec and documentation to reflect the move to "acts_as_para…
…noid"
ca592e5
@goncalossilva goncalossilva Merge branch 'rails3.2'
Conflicts:
	rails3_acts_as_paranoid.gemspec
9088943