Rc (!6) · Merge requests · Jozef Bugoš / lol-statis

Open Jozef Bugoš requested to merge rc into master 3 years ago

May 20, 2021
- Merge branch 'rc' of gitlab.fel.cvut.cz:bugosjoz/lol-statis into rc · 0ceb0c1d
  Jozef Bugos authored 3 years ago
  
  merge.
  0ceb0c1d
- finishing doccker compose · ee880c0d
  Jozef Bugos authored 3 years ago
  
  ee880c0d
- Merge branch 'master' into 'rc' · 7e4e7dc5
  Jozef Bugoš authored 3 years ago
  
  # Conflicts: # docker-compose.yml
  7e4e7dc5
- finishing doccker compose · 07ae7414
  Jozef Bugos authored 3 years ago
  
  07ae7414
May 18, 2021
- clean-up · e82b5e2f
  Jozef Bugos authored 3 years ago
  
  e82b5e2f
- Merge branch 'master' into 'rc' · afbae544
  Jozef Bugoš authored 3 years ago
  
  # Conflicts: # docker-compose.yml # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties
  afbae544
- Merge branch 'rc' of gitlab.fel.cvut.cz:bugosjoz/lol-statis into rc · bc6ff5df
  Jozef Bugos authored 3 years ago
  
  merge
  bc6ff5df
- trying to fix eurreka · 4e48c329
  Jozef Bugos authored 3 years ago
  
  4e48c329
- Merge branch 'master' into 'rc' · 8635104f
  Jozef Bugoš authored 3 years ago
  
  # Conflicts: # docker-compose.yml
  8635104f
- trying to fix eurreka · 765e4547
  Jozef Bugos authored 3 years ago
  
  765e4547
- adingg services to docker compose · 78efbab1
  Jozef Bugos authored 3 years ago
  
  78efbab1
- adding docker-compose · 9988d569
  Jozef Bugos authored 3 years ago
  
  9988d569
May 17, 2021
- updating dockerfile and pipeline · ba37d2c0
  Jozef Bugos authored 3 years ago
  
  ba37d2c0
- fixing ci/cd · 841bae74
  Jozef Bugos authored 3 years ago
  
  841bae74

Rc

Merge request reports

Activity