-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Added ignore_deleted option #958
base: master
Are you sure you want to change the base?
Added ignore_deleted option #958
Conversation
b6838a0
to
8e49837
Compare
do you think the test will work if I remove the gem and require directive? @gzzengwei Or maybe you have other idea. |
There are 6 failed CI Build which will be fix by this MR: #951 courtesy of @damianlegawiec |
@gzzengwei in our cases we don't have specific version but as stated in Contributing.md docs test needs to be pass to be merge. |
@damianlegawiec I have pick few of your changes to make CI green. I will just rebase with master once your PR is merged. Thanks in advance. |
23e71e8
to
499f66f
Compare
f444280
to
96b8253
Compare
96b8253
to
c8d191f
Compare
85f351d
to
958a56f
Compare
ac9d8b4
to
0ebed56
Compare
9a44406
to
0ebed56
Compare
0ebed56
to
373f05f
Compare
Merged with upstream Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Updated CHANGELOG Fixed Gem::LoadError: Specified 'sqlite3' Fixed spec Removed sqlite3 from gem spec Fixed incorrect tagging alias table Refactor specs Added sqlite3 to Gemfile Fixed sqlite3 version for active_record 5.0 ref Remove 'acts_as_paranoid' as dependency and add to Gemfile Transferred acts_as_paranoid to invidividual active record versions Minor changes to make CI pass Minor change Fixed spec Removed act_as_paranoid gem Removed act_as_paranoid gem Added missing methods
Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Updated CHANGELOG Fixed Gem::LoadError: Specified 'sqlite3' Fixed spec Removed sqlite3 from gem spec Fixed incorrect tagging alias table Refactor specs Added sqlite3 to Gemfile Fixed sqlite3 version for active_record 5.0 ref Remove 'acts_as_paranoid' as dependency and add to Gemfile Transferred acts_as_paranoid to invidividual active record versions Minor changes to make CI pass Minor change Fixed spec
Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Updated CHANGELOG Fixed Gem::LoadError: Specified 'sqlite3' Fixed spec Removed sqlite3 from gem spec Fixed incorrect tagging alias table Refactor specs Added sqlite3 to Gemfile Fixed sqlite3 version for active_record 5.0 ref Remove 'acts_as_paranoid' as dependency and add to Gemfile Transferred acts_as_paranoid to invidividual active record versions Minor changes to make CI pass Minor change Fixed spec
Added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Integrated act_as_paranoid and added ignore_deleted option Updated CHANGELOG Fixed Gem::LoadError: Specified 'sqlite3' Fixed spec Removed sqlite3 from gem spec Fixed incorrect tagging alias table Refactor specs Added sqlite3 to Gemfile Fixed sqlite3 version for active_record 5.0 ref Remove 'acts_as_paranoid' as dependency and add to Gemfile Transferred acts_as_paranoid to invidividual active record versions Minor changes to make CI pass Minor change Fixed spec Removed act_as_paranoid gem Adjusted specs Added checking for deleted_at column and added specs Updated specs Fixed incorrect variable and method used
Make sure alias table is unique to prevent not unique table/alias error. This is just a quick fix. I’m open for any suggestion.
373f05f
to
446862e
Compare
No description provided.