GitLab

Also removes a silly if-else construction.

Change-Id: I35e522ee0231f6b1fcf449ee47b31bbb41858e7c
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>