Rename used_timeout to timeout

9 files changed, 15 insertions, 15 deletions

diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
index 15584922d1f..6ff3fa6e099 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -45,7 +45,7 @@
         return `#${this.job.runner.id}`;
       },
       timeout() {
-        let t = `${this.job.metadata.used_timeout_human_readable}`;
+        let t = `${this.job.metadata.timeout_human_readable}`;
 
         if (this.job.metadata.timeout_source != null) {
           t += ` (from ${this.job.metadata.timeout_source})`;
@@ -130,7 +130,7 @@
         />
         <detail-row
           class="js-job-timeout"
-          v-if="job.metadata.used_timeout_human_readable"
+          v-if="job.metadata.timeout_human_readable"
           title="Timeout"
           :help-url="runnerHelpUrl"
           :value="timeout"
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7a12d7a3deb..405c89d0103 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -242,7 +242,7 @@ module Ci
     end
 
     def timeout
-      metadata.used_timeout
+      metadata.timeout
     end
 
     def triggered_by?(current_user)
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 89fee37b1b6..335209e8ec2 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -10,7 +10,7 @@ module Ci
 
     belongs_to :build, class_name: 'Ci::Build'
 
-    chronic_duration_attr_reader :used_timeout_human_readable, :used_timeout
+    chronic_duration_attr_reader :timeout_human_readable, :timeout
 
     enum timeout_source: {
         unknown_timeout_source: 1,
@@ -22,7 +22,7 @@ module Ci
       project_timeout = build.project&.build_timeout
       timeout = [project_timeout, build.runner&.maximum_timeout].compact.min
 
-      self.used_timeout = timeout
+      self.timeout = timeout
       self.timeout_source = timeout < project_timeout ? :runner_timeout_source : :project_timeout_source
 
       save!
diff --git a/app/serializers/build_metadata_entity.rb b/app/serializers/build_metadata_entity.rb
index 4b6a538665d..39f429aa6c3 100644
--- a/app/serializers/build_metadata_entity.rb
+++ b/app/serializers/build_metadata_entity.rb
@@ -1,6 +1,6 @@
 class BuildMetadataEntity < Grape::Entity
-  expose :used_timeout_human_readable do |metadata|
-    metadata.used_timeout_human_readable unless metadata.used_timeout.nil?
+  expose :timeout_human_readable do |metadata|
+    metadata.timeout_human_readable unless metadata.timeout.nil?
   end
 
   expose :timeout_source do |metadata|
diff --git a/db/migrate/20180301010859_create_ci_builds_metadata_table.rb b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb
index cd7824d7788..72c204026d8 100644
--- a/db/migrate/20180301010859_create_ci_builds_metadata_table.rb
+++ b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb
@@ -6,7 +6,7 @@ class CreateCiBuildsMetadataTable < ActiveRecord::Migration
   def change
     create_table :ci_builds_metadata, id: false do |t|
       t.integer :build_id, null: false
-      t.integer :used_timeout
+      t.integer :timeout
       t.integer :timeout_source, null: false, default: 1
 
       t.primary_key :build_id
diff --git a/db/schema.rb b/db/schema.rb
index a2967409703..a14823dfa15 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -330,7 +330,7 @@ ActiveRecord::Schema.define(version: 20180327101207) do
   add_index "ci_builds", ["user_id"], name: "index_ci_builds_on_user_id", using: :btree
 
   create_table "ci_builds_metadata", primary_key: "build_id", force: :cascade do |t|
-    t.integer "used_timeout"
+    t.integer "timeout"
     t.integer "timeout_source", default: 1, null: false
   end
 
@@ -463,8 +463,8 @@ ActiveRecord::Schema.define(version: 20180327101207) do
     t.boolean "run_untagged", default: true, null: false
     t.boolean "locked", default: false, null: false
     t.integer "access_level", default: 0, null: false
-    t.integer "maximum_timeout"
     t.string "ip_address"
+    t.integer "maximum_timeout"
   end
 
   add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree
diff --git a/spec/javascripts/jobs/mock_data.js b/spec/javascripts/jobs/mock_data.js
index 8a7ba50830c..25ca8eb6c0b 100644
--- a/spec/javascripts/jobs/mock_data.js
+++ b/spec/javascripts/jobs/mock_data.js
@@ -116,7 +116,7 @@ export default {
     },
   },
   metadata: {
-    used_timeout_human_readable: '1m 40s',
+    timeout_human_readable: '1m 40s',
     timeout_source: 'runner',
   },
   merge_request: {
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index abb2d0b5ecb..cdc2c5a8679 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -2050,8 +2050,8 @@ describe Ci::Build do
     end
 
     shared_examples 'saves data on transition' do
-      it 'saves used_timeout' do
-        expect { job.run! }.to change { job.reload.metadata.used_timeout }.from(nil).to(expected_timeout)
+      it 'saves timeout' do
+        expect { job.run! }.to change { job.reload.metadata.timeout }.from(nil).to(expected_timeout)
       end
 
       it 'saves timeout_source' do
diff --git a/spec/models/concerns/chronic_duration_attribute_spec.rb b/spec/models/concerns/chronic_duration_attribute_spec.rb
index c991d12a5fc..cfbf83dab54 100644
--- a/spec/models/concerns/chronic_duration_attribute_spec.rb
+++ b/spec/models/concerns/chronic_duration_attribute_spec.rb
@@ -65,8 +65,8 @@ describe 'ChronicDurationAttribute' do
 end
 
 describe 'ChronicDurationAttribute - reader' do
-  let(:source_field) {:used_timeout}
-  let(:virtual_field) {:used_timeout_human_readable}
+  let(:source_field) {:timeout}
+  let(:virtual_field) {:timeout_human_readable}
   subject {Ci::BuildMetadata.new}
 
   it "doesn't contain dynamically created writer method" do