Skip to content
Snippets Groups Projects

TMSS-2731: Add annotation plugin and indicate resource usage beyond granted...

Merged TMSS-2731: Add annotation plugin and indicate resource usage beyond granted...
All threads resolved!
Merged Jörn Künsemöller requested to merge TMSS-2731 into master
All threads resolved!

TMSS-2731: Add annotation plugin and indicate resource usage beyond granted quota in bar chart of project report

Closes TMSS-2731

Merge request reports

Approval is optional

Merged by Jörn KünsemöllerJörn Künsemöller 1 year ago (Oct 10, 2023 11:49am UTC)

Merge details

  • Changes merged into master with b8596055.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Reinder Kraaij
  • Looking good. Made some small comments, i leave it to you what to do with it :-)

  • added 16 commits

    Compare with previous version

  • Reinder Kraaij approved this merge request

    approved this merge request

  • added 1 commit

    Compare with previous version

  • Reinder Kraaij approved this merge request

    approved this merge request

  • looking GOod! :-)

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Jörn Künsemöller resolved all threads

    resolved all threads

  • added 18 commits

    Compare with previous version

  • I sorted out a conflicting change on master with the imports in the project report frontend. It seems to render okay, so hope that's alright. Shall we merge this then?

  • if you make sure in the merge

    import 'chart.js/auto';
    import { Bar } from 'react-chartjs-2';

    from main is present (This is required for the upgrade from chart 3 to 4, otherwise it will complain during the rendering of the report)

    I would suggest merging main into this branch, resolve the conflict, then push it , then merge it

  • added 3 commits

    Compare with previous version

  • Reinder Kraaij
  • Reinder Kraaij resolved all threads

    resolved all threads

  • mentioned in commit b8596055

  • removed for_review label

  • Please register or sign in to reply
    Loading