GitLab Synchronization: Fixed v6.3.0 rebase related errors

This commit is contained in:
Florian Porrmann
2026-10-09 16:50:10 +02:00
parent fcb3d06f24
commit 565b793055
12 changed files with 35 additions and 35 deletions
@@ -1,5 +1,5 @@
import { useTranslation, Trans } from 'react-i18next'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import {
OLModalBody,
OLModalFooter,
@@ -13,14 +13,14 @@ type GitSyncNeedPermissionModalProps = {
handleHide: () => void
}
const GitSyncNeedPermissionModal = ({ projectSyncState, handleHide }: GitSyncConflictModalProps) => {
const GitSyncNeedPermissionModal = ({ projectSyncState, handleHide }: GitSyncNeedPermissionModalProps) => {
const { t } = useTranslation()
let gitlabUrl = getMeta('ol-ExposedSettings').gitlabUrl || ''
gitlabUrl = gitlabUrl.endsWith('/') ? gitlabUrl.slice(0, -1) : gitlabUrl
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="warning"
content={(
<Trans