Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.5.0.beta1 opengov #1

Open
wants to merge 75 commits into
base: v0.4.2-opengov
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
0c692d2
Remove Gemfile.lock from repository
Feb 24, 2014
9e6ee17
Resolve warning about rake/rdoctask
Feb 24, 2014
0d5956f
Move test dependencies into gemspec as development dependencies
Feb 24, 2014
d6d4699
Support activerecord >= 4.0.0
Feb 24, 2014
631ffaf
bump gem to 0.5.0
Feb 24, 2014
587074b
Update gemspec summary and description to remove dependency mention.
Feb 24, 2014
9de04ab
Add gemfile support for testing against various versions of
Feb 24, 2014
c24aefd
Fix trailing spaces on files.
Mar 7, 2014
1f45d2d
Merge pull request #3 from andremedeiros/whitespace-fix
Mar 7, 2014
f4fc7ba
Modernized the gem, and a few other tweaks.
Mar 7, 2014
5a47cdf
Support AR from 3.0 onwards.
Mar 7, 2014
bd2d0d7
Merge pull request #1 from andremedeiros/modernize-gem
Mar 7, 2014
86ecbcd
Added gemfiles to test AR 3.1 and 3.2
Mar 7, 2014
d5a831f
Make Travis test only the versions that we actually support
Mar 7, 2014
95ecde7
Lock sqlite3 version so tests run with rbx
Mar 7, 2014
e2ad638
Silence more deprecations
Mar 7, 2014
c36e3ed
Documentation improvements
Mar 7, 2014
1bb293a
Move the AR dependency back to 3.1
Mar 7, 2014
7c543aa
Merge pull request #4 from andremedeiros/master
Mar 12, 2014
48ff312
Add Zachary to the authors and change the gem homepage.
Apr 5, 2014
67c6923
Merge pull request #5 from andremedeiros/master
May 12, 2014
5a23726
Test Ruby 2.1.x [ci skip]
May 12, 2014
879c66e
Delete duplicate description content
May 12, 2014
e7da594
Use original 0.4.x ActiveRecord dependency, we shouldn't change this
May 12, 2014
b8ebaef
Preparing 0.4.x patch level release first
May 12, 2014
2e9fd78
For this release we don't need AR 4+ gemfiles
May 12, 2014
e9cf44b
Use pessimistic dependency requirement
May 12, 2014
7fb0b5c
Use gemspec for remaining dependencies
May 12, 2014
fa21bfa
Fix typo in gemspec authors
May 12, 2014
0a66132
Add André Medeiros for his help!
May 12, 2014
5a1bafd
Enable 1.8.7 for Rails 3.x
May 12, 2014
ee96785
Allow testing of AR 3.0.0 since this patch level supports all Rails 3…
May 12, 2014
6714ab9
Revert "Allow testing of AR 3.0.0 since this patch level supports all…
May 12, 2014
f13cc2f
Correction, this patch level release will only support Rails 3.2.x
May 12, 2014
546267e
Markdown syntax
May 12, 2014
b1b61c1
Rails 3.2 still supported Ruby 1.8, so we should do our best.
May 12, 2014
7b9b0d7
Make sure we use latest sqlite3 1.3.x when testing
May 12, 2014
61b26a5
Move gemspec after platform dependencies
May 12, 2014
a944af8
Move Credits below Acknowledgements [ci skip]
May 12, 2014
2fcc4c6
Update Copyright notice [ci skip]
May 12, 2014
990a9c7
Add rdoc as development dependency to let Ruby 1.8 tests run
May 12, 2014
17cf61a
Add minitest as development dependency to let tests run on Ruby 1.8
May 12, 2014
37725d8
Remove ./gemfiles since we only test one version of Rails
May 12, 2014
5e6bc34
Mark as pre-release
May 12, 2014
fbcbdd4
Master is now 0.5.x
May 12, 2014
b583c3c
Update README.markdown
Aug 28, 2013
17617a4
Merge andremedeiros/acts_as_paranoid@f77770e manually
May 12, 2014
d2748d6
Remove init.rb
Aug 11, 2014
c1e4004
Specify branch support for master, add Gonçalo to credits.
Aug 11, 2014
f53f13b
See `LICENSE`.
Aug 11, 2014
7cb5ccd
Update homepage
Aug 11, 2014
ed2a82e
Fixed minor spelling mistake
binarycleric Aug 21, 2014
52c5166
Merge pull request #15 from binarycleric/spelling_fixup
Aug 22, 2014
75a4662
rm 1.8 support, test against ruby-head
Aug 25, 2014
2b5fa82
Target AR 4.x
Aug 25, 2014
6f7fa03
This branch targets 4.x
Aug 25, 2014
18d9ec4
Thank you @technoweenie!! <3 <3
Aug 25, 2014
f672e87
Update repository homepage to org
Aug 25, 2014
6bb32b2
build travis
Aug 25, 2014
7057280
Initial test matrix setup for AR 4+ on travis
Aug 25, 2014
82845ba
Fix typo in version iteration of Rakefile
Aug 25, 2014
5bf262e
belongs_to_with_deleted should pass scope to belongs_to_without_deleted
yuki24 Mar 19, 2013
e796b9f
don't save when destroying a non persisted object
pelargir May 11, 2013
ec9c311
Rails 4.0.0 compatibility
byroot Feb 26, 2013
d5c17ad
Merged in @byroot's Rails 4.0.0 support, thank you! <3 <3 <3
Aug 26, 2014
c6d7c28
Add travis script for test
Aug 26, 2014
115f762
bump to beta1
Aug 26, 2014
d7929c0
result is a hash
Aug 29, 2014
9fdd810
Don't eager load logger, we no longer support 1.8.7 anyways
Aug 29, 2014
6142210
Use unscoped instead of with_default_scope
Aug 29, 2014
eef6a4f
serialized_attributes has been deprecated in rails/rails#15704
Aug 29, 2014
ddcd191
Use timestamps with null: false
Aug 29, 2014
15dce0d
merged ActsAsParanoid/master into v0.4.2-opengov
pavlos Mar 9, 2015
d22837f
rebuilt Gemfile.lock
pavlos Mar 9, 2015
0d4c7ae
REVERT ME EVENTUALLY- type_for_attribute patch
pavlos Mar 22, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
result is a hash
  • Loading branch information
Zachary Scott committed Aug 29, 2014
commit d7929c0cc4b607349232d4d7a874cc6997367420
2 changes: 1 addition & 1 deletion lib/acts_as_paranoid/associations.rb
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ def belongs_to_with_deleted(target, scope = nil, options = {})
result = belongs_to_without_deleted(target, scope, options)

if with_deleted
result.options[:with_deleted] = with_deleted
result[:with_deleted] = with_deleted
unless method_defined? "#{target}_with_unscoped"
class_eval <<-RUBY, __FILE__, __LINE__
def #{target}_with_unscoped(*args)