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

[dy] Fix git issues #3458

Merged
merged 3 commits into from
Sep 8, 2023
Merged

[dy] Fix git issues #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9979336
[dy] Update GitPython version
dy46 Sep 8, 2023
a2566b5
[dy] Update git sync logic
dy46 Sep 8, 2023
4290b3b
[dy] Ignore requirements.txt
dy46 Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
poetry run pre-commit install
- id: changed-files
uses: tj-actions/changed-files@v36
with:
files_ignore: |
requirements.txt
- name: Run pre-commit hooks
run: poetry run pre-commit run --show-diff-on-failure --files ${{ steps.changed-files.outputs.all_changed_files }}

Expand Down
10 changes: 9 additions & 1 deletion mage_ai/frontend/pages/settings/workspace/sync-data.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ function SyncData() {
}
}, [dataSyncs]);

const showSyncOperations = useMemo(() => {
if (dataSyncs) {
const config = dataSyncs?.syncs?.[0];
return !!config?.branch;
}
return false;
}, [dataSyncs]);

const [createSync, { isLoading: isLoadingCreateSync }] = useMutation(
api.syncs.useCreate(),
{
Expand Down Expand Up @@ -464,7 +472,7 @@ function SyncData() {
</Spacing>
)}

{showSyncSettings && (
{showSyncOperations && (
<Spacing mt={UNITS_BETWEEN_SECTIONS}>
<Headline>
Synchronize code from remote repository
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Faker==4.14.0
GitPython==3.1.31
GitPython==3.1.34
Jinja2==3.1.2
PyGithub==1.59.0
PyJWT==2.6.0
Expand Down
Loading