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.

Sign up for GitHub

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

Jump to bottom

Allow Skipping Conflicting Apps Check #224

Merged
merged 2 commits into from Sep 29, 2023
Merged

Allow Skipping Conflicting Apps Check #224

merged 2 commits into from Sep 29, 2023

Conversation

snaselj
Copy link
Contributor

@snaselj snaselj commented Sep 29, 2023

Closes NaN

What's Changed

  • Added NAUTOBOT_SSOT_ALLOW_CONFLICTING_APPS environment variable to allow conflicting apps to remain in PLUGINS during the upgrade process.

@snaselj snaselj marked this pull request as ready for review September 29, 2023 07:31
@snaselj snaselj requested a review from a team as a code owner September 29, 2023 07:31
Kircheneer
Kircheneer reviewed Sep 29, 2023
View reviewed changes
docs/admin/upgrade.md Outdated Show resolved Hide resolved
Kircheneer
Kircheneer approved these changes Sep 29, 2023
View reviewed changes
Copy link
Contributor

@Kircheneer Kircheneer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Kircheneer Kircheneer merged commit d275542 into develop Sep 29, 2023
15 checks passed
@jdrew82 jdrew82 deleted the u/snaselj-optional-conflicts branch September 29, 2023 15:25
@jdrew82 jdrew82 mentioned this pull request Sep 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kircheneer Kircheneer Kircheneer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@snaselj @Kircheneer