Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
devops-workshop
Manage
Activity
Members
Labels
Plan
Issues
3
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container 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
Magnus Rosvold Farstad
devops-workshop
Graph
9f55246cf3be09bd8433ed33155aca0b2c7e8f24
Select Git revision
Branches
1
master
default
1 result
You can move around the graph by using the arrow keys.
Begin with the selected commit
Created with Raphaël 2.2.0
10
Mar
9
8
3
2
1
Mar
28
Feb
5
Aug
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
master
master
endret i glances.conf
Merge conflict error handling
Revisions
Fixed merge conflict
Added end point with test for editUser methods
Settings.js
Calctest.java
Calc.java ble endret Throw illegal tingen
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
Edit database.java and setting.js
Merging
A few changes
setting.js edit
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
setting.js
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
Added password hash test
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
forrige commit faila
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
Fixed merge conflict in hashPassword- method in UserDAO
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
settings.js
Revision in calculator
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
Added method for hashing password
Fikset js script for oppdatere info
Added method for generating salt and testing
Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshop
Implemented
små endring i html
html + js oppgave 3 halveis gjort
Tull
TUll
Fixed merge conflict in calculate method
Improved response from calculator with Exeptions
Updated message when calc input is wrong
Fixed testCalculate() method in CalculatorResourceTest
Fixed merge conflict in TestGetUsers and testGetUserByUsername
Loading