summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-02-26 18:56:39 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 13:57:17 +0200
commitcb502b626659001af1e0ca82288a2b427e346d18 (patch)
treec937caf4cd33dfe9978624b7cfcbf3f4a262ed14
parent3e7f3bc7980018910f6c6e7a19f706ad18ab2793 (diff)
downloadgitlab-ce-cb502b626659001af1e0ca82288a2b427e346d18.tar.gz
Remove unused method
-rw-r--r--app/models/ci/runner.rb4
-rw-r--r--spec/models/ci/runner_spec.rb18
2 files changed, 0 insertions, 22 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index baf57423682..413607e0eff 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -170,10 +170,6 @@ module Ci
end
end
- def defines_maximum_job_timeout?
- !maximum_job_timeout.nil? && maximum_job_timeout > 0
- end
-
private
def cleanup_runner_queue
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 5b5fa7fac01..ab170e6351c 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -556,24 +556,6 @@ describe Ci::Runner do
end
end
- describe '#defines_maximum_job_timeout?' do
- context 'when maximum job timeout is specified' do
- subject { create(:ci_runner, maximum_job_timeout: 1234) }
-
- it 'should return true' do
- expect(subject.defines_maximum_job_timeout?).to be_truthy
- end
- end
-
- context 'when maximum job timeout is not specified' do
- subject { create(:ci_runner) }
-
- it 'should return false' do
- expect(subject.defines_maximum_job_timeout?).to be_falsey
- end
- end
- end
-
describe '.search' do
let(:runner) { create(:ci_runner, token: '123abc', description: 'test runner') }