Rename job_upper_timeout to maximum_job_timeout

3 files changed, 14 insertions, 14 deletions

diff --git a/db/migrate/20180219153455_add_job_upper_timeout_to_ci_runners.rb b/db/migrate/20180219153455_add_job_upper_timeout_to_ci_runners.rb
deleted file mode 100644
index 418ec7ac1d9..00000000000
--- a/db/migrate/20180219153455_add_job_upper_timeout_to_ci_runners.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AddJobUpperTimeoutToCiRunners < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def up
-    add_column :ci_runners, :job_upper_timeout, :integer
-  end
-
-  def down
-    remove_column :ci_runners, :job_upper_timeout
-  end
-end
diff --git a/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb b/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb
new file mode 100644
index 00000000000..5656970ede9
--- /dev/null
+++ b/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb
@@ -0,0 +1,13 @@
+class AddMaximumJobTimeoutToCiRunners < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    add_column :ci_runners, :maximum_job_timeout, :integer
+  end
+
+  def down
+    remove_column :ci_runners, :maximum_job_timeout
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 413f42df40b..806e829dcbd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -459,7 +459,7 @@ ActiveRecord::Schema.define(version: 20180327101207) do
     t.boolean "locked", default: false, null: false
     t.integer "access_level", default: 0, null: false
     t.string "ip_address"
-    t.integer "job_upper_timeout"
+    t.integer "maximum_job_timeout"
   end
 
   add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree