Skip to content

Commit 10ba054

Browse files
committed
Merge remote-tracking branch 'origin' into fb-dev-1682
2 parents 7db9100 + 5550988 commit 10ba054

File tree

14 files changed

+111726
-20
lines changed

14 files changed

+111726
-20
lines changed

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Docker build & push"
33
on:
44
push:
55
branches:
6-
- master
6+
- develop
77
paths:
88
- deploy/**
99
- label_studio/**

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: deploy:docs
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ develop ]
66
paths:
77
- 'docs/**'
88

.github/workflows/security-linters.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
pull_request_target:
1212
types: [ opened, synchronize, reopened, ready_for_review ]
1313
branches:
14-
- master
1514
- develop
1615

1716
env:
@@ -27,7 +26,6 @@ jobs:
2726
bandit:
2827
name: "Bandit"
2928
timeout-minutes: 2
30-
if: ${{ github.head_ref != 'master' }}
3129
runs-on: ubuntu-latest
3230
steps:
3331
- uses: hmarr/[email protected]

.github/workflows/sync-pr.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
paths-ignore:
1515
- 'label_studio/frontend/**'
1616

17+
concurrency:
18+
group: ${{ github.head_ref }}
19+
1720
env:
1821
DOWNSTREAM_REPO_OWNER: heartexlabs
1922
DOWNSTREAM_REPO: label-studio-enterprise
@@ -65,6 +68,8 @@ jobs:
6568
steps.check-membership.outputs.result == 'true' &&
6669
github.event.pull_request.merged == true
6770
id: sync-merge-pr
71+
env:
72+
TITLE: ${{ github.event.pull_request.title }}
6873
with:
6974
github-token: ${{ secrets.GIT_PAT }}
7075
script: |
@@ -83,7 +88,7 @@ jobs:
8388
base_branch_name: '${{ github.base_ref }}',
8489
repo_name: '${{ github.repository }}',
8590
commit_sha : '${{ github.sha }}',
86-
title: '${{ github.event.pull_request.title }}',
91+
title: process.env.TITLE,
8792
html_url: '${{ github.event.pull_request.html_url }}',
8893
actor: '${{ github.actor }}',
8994
author_username: getCommitResponse.data.commit.author.name,
@@ -99,6 +104,8 @@ jobs:
99104
steps.check-membership.outputs.result == 'true' &&
100105
github.event.pull_request.merged != true
101106
id: sync-pr
107+
env:
108+
TITLE: ${{ github.event.pull_request.title }}
102109
with:
103110
github-token: ${{ secrets.GIT_PAT }}
104111
script: |
@@ -117,7 +124,7 @@ jobs:
117124
base_branch_name: '${{ github.base_ref }}',
118125
repo_name: '${{ github.repository }}',
119126
commit_sha : '${{ github.event.pull_request.head.sha }}',
120-
title: '${{ github.event.pull_request.title }}',
127+
title: process.env.TITLE,
121128
html_url: '${{ github.event.pull_request.html_url }}',
122129
actor: '${{ github.actor }}',
123130
author_username: getCommitResponse.data.commit.author.name,

docs/source/guide/ml.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ meta_title: Integrate Label Studio into your machine learning pipeline
77
meta_description: Connect Label Studio to machine learning frameworks using the Label Studio ML backend SDK to integrate your model development pipeline seamlessly with your data labeling workflow.
88
---
99

10-
Integrate your model development pipeline with your data labeling workflow by adding a machine learning backend to Label Studio. You can set up your favorite machine learning frameworks to do the following:
10+
Integrate your model development pipeline with your data labeling workflow by adding a machine learning (ML) backend to Label Studio. You can set up your favorite machine learning frameworks to do the following:
1111
- **Pre-labeling** by letting models predict labels and then have annotators perform further manual refinements.
1212
- **Auto-labeling** by letting models create automatic annotations.
1313
- **Online Learning** by simultaneously updating your model while new annotations are created, letting you retrain your model on-the-fly.

label_studio/frontend/dist/lsf/css/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

label_studio/frontend/dist/lsf/css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

label_studio/frontend/dist/lsf/js/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

label_studio/frontend/dist/lsf/js/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"message": "fix: DEV-2394: Zoomed image region out of bounds (#642)\n\n* fix: DEV-2394: Zoomed image region out of bounds\r\n\r\n* test: DEV-2394: Add test for bounds of transformations for zoomed image regions\r\n\r\n* fix: DEV-2394: Fix stage position recalculation on window resize\r\n\r\nCo-authored-by: Nick Skriabin <[email protected]>",
3-
"commit": "efb2149a13ae2f17d6f71678deb41a2b9b179fac",
4-
"branch": "master",
5-
"date": "2022-06-03T09:25:28Z"
2+
"message": "check visibiltiy mixin for taxonomy",
3+
"commit": "8a3071dafd72589dd8a49e301cfdf719fa157c5a",
4+
"branch": "fb-dev-1975/support-long-unborken-taxonomy",
5+
"date": "2022-06-07T18:03:32Z"
66
}

0 commit comments

Comments
 (0)