Commit 19b97c43 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'master' into 'master' 

feat: Add an input to change the gitlab instance used in component & remote mode

See merge request to-be-continuous/kicker!366
parents 2e985bc6 6289b998

src/app/gitlab-ci/gitlab-ci.component.css

+12 −0
Original line number Diff line number Diff line
@@ -53,3 +53,15 @@ textarea.code { 
  background-color: black;

  color: white;

}

.custom-control-text {

  position: relative;

  display: block;

  min-height: 1.25rem;

}

.custom-control-label-text {

  margin: auto .625rem auto 0;

}

.custom-control-input-text {

  width: 15rem;

  display: unset;

}
 
 No newline at end of file

src/app/gitlab-ci/gitlab-ci.component.html

+8 −2
Original line number Diff line number Diff line
@@ -46,9 +46,15 @@ 
  </div>

  <!-- Show Stages -->

  <div class="custom-control custom-control-inline custom-checkbox ml-4 mb-0">

      <label class="custom-control-label" for="stages-control">With stages <i class="fas fa-circle-info" ngbTooltip="Required if you wish to override default stages."></i></label>

      <input type="checkbox" class="custom-control-input" id="stages-control"

          [(ngModel)]="options.showStages">

    <label class="custom-control-label" for="stages-control">With stages <i class="fas fa-circle-info" ngbTooltip="Required if you wish to override default stages."></i></label>

  </div>

  <!-- Gitlab instance -->

  <div *ngIf="!isProjectMode()" class="custom-control-text ml-4 mb-0">

      <label class="custom-control-label-text" for="gitlab-host">GitLab Host <i class="fas fa-circle-info" ngbTooltip="Set the GitLab server host (FQDN) you want to use."></i></label>

      <input type="text" class="form-control custom-control-input-text" id="gitlab-host"

          [(ngModel)]="serverHost">

  </div>

</div>

<div class="gitlab-ci-container">

src/app/gitlab-ci/gitlab-ci.component.ts

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ export class GitlabCiComponent { 
  ) {

  }



  isProjectMode() {

    return this.options.includeMode == IncludeMode.project;

  }



  hasIncludes() {

    return this.templates.filter(t => t.enabled).length > 0;

  }