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

feat: merge incidents #2274

Merged
merged 15 commits into from
Oct 29, 2024
Merged

Conversation

Kiryous
Copy link
Contributor

@Kiryous Kiryous commented Oct 23, 2024

Closes #2042

📑 Description

This PR combines

  1. previously reviewed parts of the Merge Incidents feature:
    1. feat: add merge incidents endpoint [dnm] #2259
    2. feat: merge incidents list (frontend + severity update fix) #2311
  2. Polish of Incidents List UI: dropdown menu, status change dropdown, demo:

    Watch Loom

✅ Checks

  • My pull request adheres to the code style of this project
  • My code requires changes to the documentation
  • I have updated the documentation as required
  • All the tests have passed

ℹ Additional Information

Copy link

vercel bot commented Oct 23, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
keep ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 29, 2024 10:35am

@Kiryous Kiryous changed the title feat: add merge incidents endpoint [dnm] (#2259) feat: merge incidents (#2042) Oct 23, 2024
@Kiryous Kiryous changed the title feat: merge incidents (#2042) feat: merge incidents Oct 23, 2024
@Kiryous Kiryous marked this pull request as ready for review October 29, 2024 08:28
@dosubot dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. Feature A new feature UI User interface related issues labels Oct 29, 2024
Copy link

gitguardian bot commented Oct 29, 2024

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
14332896 Triggered Generic Password 5714d39 keep/providers/graylog_provider/docker-compose.yml View secret
14332896 Triggered Generic Password 979d388 keep/providers/graylog_provider/docker-compose.yml View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Copy link
Member

@shahargl shahargl left a comment

Choose a reason for hiding this comment

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

lgtm

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 29, 2024
@Kiryous Kiryous merged commit f549b05 into main Oct 29, 2024
9 of 12 checks passed
@Kiryous Kiryous deleted the feature/2042-split-merge-incidents-feature branch October 29, 2024 10:59
@Matvey-Kuk
Copy link
Contributor

Matvey-Kuk commented Oct 29, 2024

This is brilliant. About polishing, I’m so happy you have this passion for small details!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature A new feature lgtm This PR has been approved by a maintainer size:XXL This PR changes 1000+ lines, ignoring generated files. UI User interface related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[➕ Feature]: Merge of incidents
3 participants