Updated GitLab CI to run SonarQube for all branches.

.gitlab-ci.yml

@@ -52,16 +52,15 @@ SonarScanner:
       -Dsonar.login=$SONARQUBE_TOKEN
       -Dsonar.branch.name=$CI_COMMIT_REF_NAME
       -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY
-  only:
-    - master
-    - staging
 
-Staging:
+Deployment:
   image: ruby:2.4
   stage: deploy
   only:
     refs:
-      - staging
+      - master
+  when: manual
+  allow_failure: true
   before_script:
     - gem install dpl
     - wget -qO- https://cli-assets.heroku.com/install-ubuntu.sh | sh
@@ -72,21 +71,3 @@ Staging:
   environment:
     name: staging
     url: $HEROKU_APP_HOST_STAGING
-
-  
-# Deployment:
-#   image: ruby:2.4
-#   stage: deploy
-#   only:
-#     refs:
-#       - master
-#   before_script:
-#     - gem install dpl
-#     - wget -qO- https://cli-assets.heroku.com/install-ubuntu.sh | sh
-#   script:
-#     - dpl --provider=heroku --app=$HEROKU_APPNAME --api-key=$HEROKU_APIKEY
-#     - export HEROKU_API_KEY=$HEROKU_APIKEY
-#     - heroku run --app $HEROKU_APPNAME migrate
-#   environment:
-#     name: production
-#     url: $HEROKU_APP_HOST