Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Queue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Automate
Agent sessions
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Queue
Commits
6fa8ba85
Commit
6fa8ba85
authored
Apr 20, 2020
by
Chris Lemaire
Browse files
Options
Downloads
Plain Diff
Merge branch 'migrationHotFix' into 'development'
Production hotfixes See merge request
!295
parents
d34fa6c0
bdb8c0f1
No related branches found
No related tags found
3 merge requests
!364
Release to master
,
!360
Release 1.2.0
,
!295
Production hotfixes
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/nl/tudelft/ewi/queue/viewmodel/RequestCreateModel.java
+1
-1
1 addition, 1 deletion
...va/nl/tudelft/ewi/queue/viewmodel/RequestCreateModel.java
src/main/resources/migrations.yaml
+4
-3
4 additions, 3 deletions
src/main/resources/migrations.yaml
with
5 additions
and
4 deletions
src/main/java/nl/tudelft/ewi/queue/viewmodel/RequestCreateModel.java
+
1
−
1
View file @
6fa8ba85
...
@@ -68,7 +68,7 @@ public class RequestCreateModel {
...
@@ -68,7 +68,7 @@ public class RequestCreateModel {
r
.
setQuestion
(
question
);
r
.
setQuestion
(
question
);
r
.
setLab
(
lab
);
r
.
setLab
(
lab
);
r
.
setAssignment
(
assignment
);
r
.
setAssignment
(
assignment
);
if
(
jitsi
)
{
if
(
jitsi
!=
null
&&
jitsi
)
{
r
.
setJitsiRoom
();
r
.
setJitsiRoom
();
}
}
return
r
;
return
r
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/migrations.yaml
+
4
−
3
View file @
6fa8ba85
...
@@ -171,13 +171,14 @@ databaseChangeLog:
...
@@ -171,13 +171,14 @@ databaseChangeLog:
-
renameColumn
:
-
renameColumn
:
newColumnName
:
enqueue_closed
newColumnName
:
enqueue_closed
oldColumnName
:
exam_closed
oldColumnName
:
exam_closed
columnDataType
:
bool
tableName
:
lab
tableName
:
lab
-
changeSet
:
-
changeSet
:
-
id
:
7-1
-
id
:
7-1
-
author
:
"
Cedric
Willekens"
-
author
:
"
Cedric
Willekens"
-
changes
:
-
changes
:
-
addColumn
:
-
addColumn
:
tableName
:
NOTIFICATION
tableName
:
notification
columns
:
columns
:
-
column
:
-
column
:
name
:
url
name
:
url
...
@@ -190,10 +191,10 @@ databaseChangeLog:
...
@@ -190,10 +191,10 @@ databaseChangeLog:
tableName
:
lab
tableName
:
lab
oldColumnName
:
direction
oldColumnName
:
direction
newColumnName
:
communication_method
newColumnName
:
communication_method
columnDataType
:
VARCHAR
columnDataType
:
VARCHAR
(255)
-
addColumn
:
-
addColumn
:
tableName
:
request
tableName
:
request
columns
:
columns
:
-
column
:
-
column
:
name
:
jitsi_room
name
:
jitsi_room
type
:
VARCHAR
type
:
VARCHAR
(255)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment