move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb`

13 files changed, 24 insertions, 22 deletions

diff --git a/app/models/ci/group_variable.rb b/app/models/ci/group_variable.rb
index f64bc245a67..afeae69ba39 100644
--- a/app/models/ci/group_variable.rb
+++ b/app/models/ci/group_variable.rb
@@ -1,6 +1,6 @@
 module Ci
   class GroupVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
     include Presentable
 
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 871c76fbad3..72946439d43 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -1,6 +1,6 @@
 module Ci
   class Pipeline < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasStatus
     include Importable
     include AfterCommitQueue
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb
index e7e02587759..10ead6b6d3b 100644
--- a/app/models/ci/pipeline_schedule.rb
+++ b/app/models/ci/pipeline_schedule.rb
@@ -1,6 +1,6 @@
 module Ci
   class PipelineSchedule < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include Importable
 
     acts_as_paranoid
diff --git a/app/models/ci/pipeline_schedule_variable.rb b/app/models/ci/pipeline_schedule_variable.rb
index ee5b8733fac..af989fb14b4 100644
--- a/app/models/ci/pipeline_schedule_variable.rb
+++ b/app/models/ci/pipeline_schedule_variable.rb
@@ -1,6 +1,6 @@
 module Ci
   class PipelineScheduleVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
 
     belongs_to :pipeline_schedule
diff --git a/app/models/ci/pipeline_variable.rb b/app/models/ci/pipeline_variable.rb
index 00b419c3efa..de5aae17a15 100644
--- a/app/models/ci/pipeline_variable.rb
+++ b/app/models/ci/pipeline_variable.rb
@@ -1,6 +1,6 @@
 module Ci
   class PipelineVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
 
     belongs_to :pipeline
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index b1798084787..a0d07902ba2 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -1,6 +1,6 @@
 module Ci
   class Runner < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
     ONLINE_CONTACT_TIMEOUT = 1.hour
diff --git a/app/models/ci/runner_project.rb b/app/models/ci/runner_project.rb
index 5f01a0daae9..505d178ba8e 100644
--- a/app/models/ci/runner_project.rb
+++ b/app/models/ci/runner_project.rb
@@ -1,6 +1,6 @@
 module Ci
   class RunnerProject < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     belongs_to :runner
     belongs_to :project
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index 754c37518b3..75b8ea2a371 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -1,6 +1,6 @@
 module Ci
   class Stage < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include Importable
     include HasStatus
     include Gitlab::OptimisticLocking
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 6df41a3f301..b5290bcaf53 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -1,6 +1,6 @@
 module Ci
   class Trigger < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     acts_as_paranoid
 
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 2c860598281..215b1cf6753 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -1,6 +1,6 @@
 module Ci
   class TriggerRequest < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     belongs_to :trigger
     belongs_to :pipeline, foreign_key: :commit_id
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index cf0fe04ddaf..67d3ec81b6f 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -1,6 +1,6 @@
 module Ci
   class Variable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
     include Presentable
 
diff --git a/lib/ci/model.rb b/lib/ci/model.rb
deleted file mode 100644
index c42a0ad36db..00000000000
--- a/lib/ci/model.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Ci
-  module Model
-    def table_name_prefix
-      "ci_"
-    end
-
-    def model_name
-      @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
-    end
-  end
-end
diff --git a/lib/gitlab/ci/model.rb b/lib/gitlab/ci/model.rb
new file mode 100644
index 00000000000..3994a50772b
--- /dev/null
+++ b/lib/gitlab/ci/model.rb
@@ -0,0 +1,13 @@
+module Gitlab
+  module Ci
+    module Model
+      def table_name_prefix
+        "ci_"
+      end
+
+      def model_name
+        @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
+      end
+    end
+  end
+end