diff options
| -rw-r--r-- | app/presenters/ci/build_metadata_presenter.rb | 4 | ||||
| -rw-r--r-- | app/presenters/ci/build_presenter.rb | 1 | ||||
| -rw-r--r-- | app/serializers/build_metadata_entity.rb | 1 | ||||
| -rw-r--r-- | spec/javascripts/jobs/sidebar_detail_row_spec.js | 1 | ||||
| -rw-r--r-- | spec/models/concerns/chronic_duration_attribute_spec.rb | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/app/presenters/ci/build_metadata_presenter.rb b/app/presenters/ci/build_metadata_presenter.rb index e80eb19ea19..5048f967ea8 100644 --- a/app/presenters/ci/build_metadata_presenter.rb +++ b/app/presenters/ci/build_metadata_presenter.rb @@ -1,6 +1,5 @@ module Ci class BuildMetadataPresenter < Gitlab::View::Presenter::Delegated - TIMEOUT_SOURCES = { unknown_timeout_source: nil, project_timeout_source: 'project', @@ -13,8 +12,7 @@ module Ci return unless metadata.timeout_source? TIMEOUT_SOURCES[metadata.timeout_source.to_sym] || - metadata.timeout_source + metadata.timeout_source end - end end diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb index 9345e5069bc..255475e1fe6 100644 --- a/app/presenters/ci/build_presenter.rb +++ b/app/presenters/ci/build_presenter.rb @@ -1,6 +1,5 @@ module Ci class BuildPresenter < Gitlab::View::Presenter::Delegated - presents :build def erased_by_user? diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb index 71c7295ba9f..4b6a538665d 100644 --- a/app/serializers/build_metadata_entity.rb +++ b/app/serializers/build_metadata_entity.rb @@ -1,5 +1,4 @@ class BuildMetadataEntity < Grape::Entity - expose :used_timeout_human_readable do |metadata| metadata.used_timeout_human_readable unless metadata.used_timeout.nil? end diff --git a/spec/javascripts/jobs/sidebar_detail_row_spec.js b/spec/javascripts/jobs/sidebar_detail_row_spec.js index e1f0fe334ac..e66cb4d9809 100644 --- a/spec/javascripts/jobs/sidebar_detail_row_spec.js +++ b/spec/javascripts/jobs/sidebar_detail_row_spec.js @@ -53,5 +53,4 @@ describe('Sidebar detail row', () => { it('should render help when helpUrl is provided', () => { expect(vm.$el.querySelector('.help-button a').getAttribute('href')).toEqual('help url'); }); - }); diff --git a/spec/models/concerns/chronic_duration_attribute_spec.rb b/spec/models/concerns/chronic_duration_attribute_spec.rb index fbbbcd374ee..b1ffeb0c74f 100644 --- a/spec/models/concerns/chronic_duration_attribute_spec.rb +++ b/spec/models/concerns/chronic_duration_attribute_spec.rb @@ -39,7 +39,8 @@ end describe 'ChronicDurationAttribute' do let(:source_field) {:maximum_job_timeout} let(:virtual_field) {:maximum_job_timeout_human_readable} - subject {Ci::Runner.new} + + subject { Ci::Runner.new } it_behaves_like 'ChronicDurationAttribute reader' it_behaves_like 'ChronicDurationAttribute writer' |