Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
idatt2106_2023_11_backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joakim Falch
idatt2106_2023_11_backend
Merge requests
!4
Edited user to contain nickname
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Edited user to contain nickname
6-login-functionality
into
main
Overview
0
Commits
1
Pipelines
1
Changes
3
Merged
Joakim Falch
requested to merge
6-login-functionality
into
main
2 years ago
Overview
0
Commits
1
Pipelines
1
Changes
3
Expand
Closes
#6 (closed)
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
fd401709
1 commit,
2 years ago
3 files
+
6
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
src/main/java/edu/ntnu/idatt2106/backend/model/user/User.java
+
2
−
1
Options
@@ -17,13 +17,14 @@ public class User {
@Id
private
String
email
;
private
String
nickname
;
private
Long
phoneNumber
;
private
String
address
;
private
Role
role
;
private
byte
[]
password
;
private
byte
[]
salt
;
public
User
(
String
email
,
Long
phoneNumber
,
String
address
,
Role
role
)
{
public
User
(
String
email
,
String
nickname
,
Long
phoneNumber
,
String
address
,
Role
role
)
{
this
.
email
=
email
;
this
.
address
=
address
;
this
.
phoneNumber
=
phoneNumber
;
Loading