diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 16:26:06 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 16:26:06 +0300 |
| commit | 5af7e8422bdff28fff3cde6cf31a0c6fde21918b (patch) | |
| tree | c74a137f4bb9e9c5135445be1ee2e8812b78bdf4 /app/models | |
| parent | 86be4a6f466205b415de74330dd495a2e8b3c9d0 (diff) | |
| parent | 579fa8b8ec7eb38d40c96521f517c9dab8c3b97a (diff) | |
Merge branch 'gt-fix-styling-for-pages-status' into 'master'
Fix styling for `app/assets/stylesheets/pages/status.scss`
Closes #59929
See merge request gitlab-org/gitlab-ce!26875
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/mock_ci_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/mock_ci_service.rb b/app/models/project_services/mock_ci_service.rb index d8bba58dcbf..c5e5f4f6400 100644 --- a/app/models/project_services/mock_ci_service.rb +++ b/app/models/project_services/mock_ci_service.rb @@ -2,7 +2,7 @@ # For an example companion mocking service, see https://gitlab.com/gitlab-org/gitlab-mock-ci-service class MockCiService < CiService - ALLOWED_STATES = %w[failed canceled running pending success success_with_warnings skipped not_found].freeze + ALLOWED_STATES = %w[failed canceled running pending success success-with-warnings skipped not_found].freeze prop_accessor :mock_service_url validates :mock_service_url, presence: true, public_url: true, if: :activated? |