Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: HumanSignal/label-studio
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: Khan/label-studio
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref

Commits on Aug 10, 2023

  1. Removing unused GitHub workflows (#2)

    ## Summary:
    Audited and I don't believe we need these workflows in our backend fork. There are some other workflows we may want to disable or change, but I'll address those in a separate PR.
    
    Issue: https://khanacademy.atlassian.net/browse/DI-618
    
    ## Test plan:
    - will enable actions after this
    
    Author: lizfaubell
    
    Reviewers: jimmykodes, dat-boris, lizfaubell
    
    Required Reviewers:
    
    Approved By: jimmykodes, dat-boris
    
    Checks: ⏭  Sync, ✅ Set Aha! Releases field, ❌ PR label validator, ✅ Submodules/deps, ⏭  Sync, ❌ PR label validator, ✅ Set Aha! Releases field, ✅ Submodules/deps
    
    Pull Request URL: Khan#2
    lizfaubell authored Aug 10, 2023
    Copy the full SHA
    e618439 View commit details

Commits on Aug 11, 2023

  1. add user rbac and iap (#1)

    * feat: add user rbac and iap
    
    * fix: remove admin registration
    
    * docs: add docstrings to iap middleware
    
    * fix: tweak settings files for running in test
    
    * docs: add readme pointing to confluence
    jimmykodes authored Aug 11, 2023
    Copy the full SHA
    7ca0be4 View commit details

Commits on Sep 15, 2023

  1. Create sync_to_release.yml

    Scaffold for testing
    lizfaubell authored Sep 15, 2023
    Copy the full SHA
    7c0135c View commit details

Commits on Sep 19, 2023

  1. Adding scheduled sync to release branch (#3)

    ## Summary:
    Adding a weekly scheduled sync to merge the `develop` branch into the `release` branch. This will run at 0600 UTC on Mondays and notify #infrastructure-data-alerts on failure.
    
    Issue: DI-618
    
    ## Test plan:
    - ran in workflow-testing branch (minus the `git push` command): https://github.com/Khan/label-studio/actions/runs/6201027085
    - note: this failed because I didn't include the notify slack action on this branch
    
    Author: lizfaubell
    
    Reviewers: jimmykodes, dat-boris
    
    Required Reviewers:
    
    Approved By: jimmykodes, dat-boris
    
    Checks: ✅ Submodules/deps, ✅ Submodules/deps
    
    Pull Request URL: Khan#3
    lizfaubell authored Sep 19, 2023
    Copy the full SHA
    545179c View commit details

Commits on Sep 20, 2023

  1. Audit: adding workflow_dispatch to follow-merge-upstream-repo-sync

    Adding workflow_dispatch so I can test this manually on the workflow-testing branch.
    lizfaubell authored Sep 20, 2023
    Copy the full SHA
    f10a663 View commit details

Commits on Sep 21, 2023

  1. Syncing frontend label studio to backend (#4)

    ## Summary:
    Updating the sync frontend code to work with our repositories. This workflow is run under 2 circumstances:
    
    1. A weekly scheduled sync
    2. When a PR is merged to the main branch of the label-studio-frontend repository
    
    Frontend testing is done within the frontend repo itself. This workflow buils the docs and static assets for the site (basically replacing the manual sync we need to do in ml-infra).
    
    Also fixing an issue with the notify slack action.
    
    Issue: https://khanacademy.atlassian.net/browse/DI-529
    
    ## Test plan:
    - ran scheduled sync in workflow testing branch to verify it sends the dispatch message: https://github.com/Khan/label-studio/actions/runs/6255067305
    - ran merge job manually in workflow-testing (had to hardcode commit values because repository_dispatch action can only send to the default branch): Khan@b9e663e, Khan@c3edf97
    - deployed ml-infra to test environment off of this workflow-testing branch, verified Jimmy's firefox fix is in: https://github.com/Khan/ml-infra/actions/runs/6255236042
    
    <img width="745" alt="Screenshot 2023-09-20 at 16 46 52" src="https://github.com/Khan/label-studio/assets/50882112/ff8350cb-08ce-408f-b883-02cdce3b78df">
    
    Author: lizfaubell
    
    Reviewers: dat-boris, jimmykodes, lizfaubell
    
    Required Reviewers:
    
    Approved By: dat-boris, jimmykodes
    
    Checks: ✅ Submodules/deps, ✅ Submodules/deps
    
    Pull Request URL: Khan#4
    lizfaubell authored Sep 21, 2023
    Copy the full SHA
    695ea6d View commit details
  2. Copy the full SHA
    059631a View commit details
  3. Copy the full SHA
    b16e91f View commit details

Commits on Sep 25, 2023

  1. Copy the full SHA
    e79de9e View commit details

Commits on Oct 2, 2023

  1. Copy the full SHA
    b192548 View commit details

Commits on Oct 9, 2023

  1. Copy the full SHA
    764bf51 View commit details

Commits on Oct 16, 2023

  1. Copy the full SHA
    e8e28c9 View commit details

Commits on Oct 23, 2023

  1. Copy the full SHA
    11c6c9a View commit details

Commits on Oct 30, 2023

  1. Copy the full SHA
    5671ebd View commit details

Commits on Nov 6, 2023

  1. Copy the full SHA
    20d7d03 View commit details

Commits on Nov 13, 2023

  1. Copy the full SHA
    6bcb5a3 View commit details

Commits on Nov 20, 2023

  1. Copy the full SHA
    02570a5 View commit details

Commits on Nov 27, 2023

  1. Copy the full SHA
    e8fa80a View commit details

Commits on Dec 4, 2023

  1. Copy the full SHA
    33f26c3 View commit details

Commits on Dec 11, 2023

  1. Copy the full SHA
    1014c1d View commit details

Commits on Dec 18, 2023

  1. Copy the full SHA
    ce26d95 View commit details

Commits on Dec 25, 2023

  1. Copy the full SHA
    63ddf63 View commit details

Commits on Jan 1, 2024

  1. Copy the full SHA
    71b51ae View commit details

Commits on Jan 8, 2024

  1. Copy the full SHA
    9e3c61a View commit details

Commits on Jan 15, 2024

  1. Copy the full SHA
    138f66a View commit details

Commits on Jan 22, 2024

  1. Copy the full SHA
    5dbcd58 View commit details

Commits on Jan 29, 2024

  1. Copy the full SHA
    2e271ce View commit details

Commits on Feb 5, 2024

  1. Copy the full SHA
    1e8254b View commit details

Commits on Feb 12, 2024

  1. Copy the full SHA
    9601de1 View commit details

Commits on Feb 19, 2024

  1. Copy the full SHA
    3b84c24 View commit details

Commits on Feb 26, 2024

  1. Copy the full SHA
    2dd9b5f View commit details

Commits on Mar 4, 2024

  1. Copy the full SHA
    98e2b29 View commit details

Commits on Mar 11, 2024

  1. Copy the full SHA
    8486f5e View commit details

Commits on Mar 18, 2024

  1. Copy the full SHA
    c90fc20 View commit details

Commits on Mar 25, 2024

  1. Copy the full SHA
    42a1caf View commit details

Commits on Apr 1, 2024

  1. Copy the full SHA
    4abc2fc View commit details

Commits on Apr 8, 2024

  1. Copy the full SHA
    9b4da85 View commit details

Commits on Apr 15, 2024

  1. Copy the full SHA
    912c540 View commit details

Commits on Apr 22, 2024

  1. Copy the full SHA
    be760e1 View commit details

Commits on Apr 29, 2024

  1. Copy the full SHA
    9db1fe6 View commit details

Commits on May 6, 2024

  1. Copy the full SHA
    6851aa2 View commit details

Commits on May 13, 2024

  1. Copy the full SHA
    1563a7e View commit details

Commits on May 20, 2024

  1. Copy the full SHA
    4faec5c View commit details

Commits on May 27, 2024

  1. Copy the full SHA
    3d2dbba View commit details

Commits on Jun 3, 2024

  1. Copy the full SHA
    38e81bd View commit details

Commits on Jun 10, 2024

  1. Copy the full SHA
    2db8201 View commit details

Commits on Jun 17, 2024

  1. Copy the full SHA
    b9d9ac9 View commit details

Commits on Jun 24, 2024

  1. Copy the full SHA
    ee6972a View commit details

Commits on Jul 1, 2024

  1. Copy the full SHA
    7920c11 View commit details

Commits on Jul 8, 2024

  1. Copy the full SHA
    bfe5ae1 View commit details
Showing with 499 additions and 2,378 deletions.
  1. +24 −0 .github/actions/notify_slack/action.yml
  2. +0 −35 .github/workflows/algolia-crawler.yml
  3. +0 −52 .github/workflows/bandit.yml
  4. +0 −60 .github/workflows/bump-helm-chart.yml
  5. +0 −19 .github/workflows/codespell.yml
  6. +0 −26 .github/workflows/delete_pr_branch.yml
  7. +0 −106 .github/workflows/docker-build-ontop.yml
  8. +0 −175 .github/workflows/docker-build-ubi.yml
  9. +0 −251 .github/workflows/docker-release-promote.yml
  10. +0 −70 .github/workflows/feature-flags-update.yml
  11. +0 −80 .github/workflows/ff-command.yml
  12. +13 −4 .github/workflows/follow-merge-lsf-sync-schedule.yml
  13. +0 −105 .github/workflows/follow-merge-sync-pr.yml
  14. +26 −417 .github/workflows/follow-merge-upstream-repo-sync.yml
  15. +3 −2 .github/workflows/frontend-build.yml
  16. +0 −142 .github/workflows/frontend-command.yml
  17. +0 −122 .github/workflows/git-command.yml
  18. +0 −22 .github/workflows/help-command.yml
  19. +0 −43 .github/workflows/invite-check.yml
  20. +0 −111 .github/workflows/pr-labeler.yml
  21. +0 −191 .github/workflows/release-cut-off-release-branch.yml
  22. +0 −127 .github/workflows/release-pipeline.yml
  23. +0 −101 .github/workflows/release-set-version.yml
  24. +0 −60 .github/workflows/slash-command-dispatch.yml
  25. +0 −31 .github/workflows/stale.yml
  26. +33 −0 .github/workflows/sync_to_release.yml
  27. +0 −14 docs/source/tags/paragraphs.md
  28. +0 −1 docs/source/tags/rectanglelabels.md
  29. +2 −2 label_studio/frontend/dist/dm/css/main.css
  30. +1 −1 label_studio/frontend/dist/lsf/css/main.css
  31. +1 −1 label_studio/frontend/dist/lsf/css/main.css.map
  32. +1 −1 label_studio/frontend/dist/lsf/js/main.js
  33. +9 −0 label_studio/frontend/dist/lsf/js/main.js.LICENSE.txt
  34. +1 −1 label_studio/frontend/dist/lsf/js/main.js.map
  35. +3 −3 label_studio/frontend/dist/lsf/version.json
  36. +105 −0 label_studio/khan/iap/middleware.py
  37. 0 label_studio/khan/rbac/__init__.py
  38. +6 −0 label_studio/khan/rbac/admin.py
  39. +5 −0 label_studio/khan/rbac/apps.py
  40. +23 −0 label_studio/khan/rbac/migrations/0001_initial.py
  41. 0 label_studio/khan/rbac/migrations/__init__.py
  42. +40 −0 label_studio/khan/rbac/models.py
  43. +29 −0 label_studio/khan/rbac/permission.py
  44. +50 −0 label_studio/khan/rbac/roles.py
  45. +3 −0 label_studio/khan/readme.md
  46. +49 −0 label_studio/khan/settings/base.py
  47. +15 −0 label_studio/khan/settings/local.py
  48. +6 −0 label_studio/khan/settings/prod.py
  49. +13 −0 label_studio/khan/settings/test.py
  50. +38 −2 label_studio/tasks/serializers.py
24 changes: 24 additions & 0 deletions .github/actions/notify_slack/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Notify Slack on workflow failure
description: notifies infrastructure-data-alerts channel on workflow failure.

inputs:
webhook_url:
description: "Slack webhook url"
required: true

runs:
using: "composite"
steps:
- name: Notify slack on failure
uses: slackapi/slack-github-action@v1.23.0
with:
payload: |
{
"project": "${{ github.repository }}",
"workflow": "${{ github.workflow }}",
"status": "${{ job.status }}",
"build": "https://github.com/Khan/label-studio/actions/runs/${{ github.run_id }}"
}
env:
# Notifies the #infrastructure-data-alerts channel.
SLACK_WEBHOOK_URL: ${{ inputs.webhook_url }}
35 changes: 0 additions & 35 deletions .github/workflows/algolia-crawler.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/bandit.yml

This file was deleted.

60 changes: 0 additions & 60 deletions .github/workflows/bump-helm-chart.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/codespell.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/delete_pr_branch.yml

This file was deleted.

106 changes: 0 additions & 106 deletions .github/workflows/docker-build-ontop.yml

This file was deleted.

Loading