Skip to content
Snippets Groups Projects
Commit 8ae82abc authored by michael.minelli's avatar michael.minelli
Browse files

Merge branch 'move-to-gitbeaker' into v3.6

parents c4efbcfb 488f4ee9
No related branches found
No related tags found
No related merge requests found
import GitlabRepository from '../../shared/types/Gitlab/GitlabRepository'; import User from './User';
import User from './User'; import Exercise from './Exercise';
import Exercise from './Exercise'; import * as Gitlab from '@gitbeaker/rest';
interface Assignment { interface Assignment {
name: string; name: string;
gitlabId: number; gitlabId: number;
gitlabLink: string; gitlabLink: string;
gitlabCreationInfo: GitlabRepository; gitlabCreationInfo: Gitlab.ProjectSchema;
gitlabLastInfo: GitlabRepository; gitlabLastInfo: Gitlab.ProjectSchema;
gitlabLastInfoDate: string; gitlabLastInfoDate: string;
published: boolean; published: boolean;
......
import GitlabRepository from '../../shared/types/Gitlab/GitlabRepository'; import User from './User';
import * as Gitlab from '@gitbeaker/rest'; import Assignment from './Assignment';
import User from './User'; import * as Gitlab from '@gitbeaker/rest';
import Assignment from './Assignment';
interface Exercise { interface Exercise {
...@@ -10,8 +9,8 @@ interface Exercise { ...@@ -10,8 +9,8 @@ interface Exercise {
name: string; name: string;
gitlabId: number; gitlabId: number;
gitlabLink: string; gitlabLink: string;
gitlabCreationInfo: GitlabRepository; gitlabCreationInfo: Gitlab.ProjectSchema;
gitlabLastInfo: GitlabRepository; gitlabLastInfo: Gitlab.ProjectSchema;
gitlabLastInfoDate: string; gitlabLastInfoDate: string;
members: Array<User> | undefined; members: Array<User> | undefined;
......
import AssignmentFile from '../../shared/types/Dojo/AssignmentFile'; import AssignmentFile from '../../shared/types/Dojo/AssignmentFile';
import Assignment from './Assignment'; import Assignment from './Assignment';
import GitlabFile from '../../shared/types/Gitlab/GitlabFile'; import * as Gitlab from '@gitbeaker/rest';
interface ExerciseAssignment { interface ExerciseAssignment {
assignment: Assignment; assignment: Assignment;
assignmentFile: AssignmentFile; assignmentFile: AssignmentFile;
immutable: Array<GitlabFile>; immutable: Array<Gitlab.RepositoryFileSchema>;
} }
......
import UserRole from './UserRole'; import UserRole from './UserRole';
import Exercise from './Exercise'; import Exercise from './Exercise';
import Assignment from './Assignment'; import Assignment from './Assignment';
import GitlabProfile from '../../shared/types/Gitlab/GitlabProfile'; import * as Gitlab from '@gitbeaker/rest';
interface User { interface User {
...@@ -10,7 +10,7 @@ interface User { ...@@ -10,7 +10,7 @@ interface User {
mail: string; mail: string;
role: UserRole; role: UserRole;
gitlabUsername: string; gitlabUsername: string;
gitlabLastInfo: GitlabProfile; gitlabLastInfo: Gitlab.ExpandedUserSchema;
isTeachingStaff: boolean; isTeachingStaff: boolean;
isAdmin: boolean; isAdmin: boolean;
deleted: boolean; deleted: boolean;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment