From b125006517db2b20a29ebbb9e7ad6f6ef03a216f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 29 Aug 2016 09:20:53 +0200
Subject: Do not enforce using a hash with hidden ci key

---
 lib/gitlab/ci/config/node/hidden_job.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/node/hidden_job.rb b/lib/gitlab/ci/config/node/hidden_job.rb
index 073044b66f8..19514a653b0 100644
--- a/lib/gitlab/ci/config/node/hidden_job.rb
+++ b/lib/gitlab/ci/config/node/hidden_job.rb
@@ -9,7 +9,6 @@ module Gitlab
           include Validatable
 
           validations do
-            validates :config, type: Hash
             validates :config, presence: true
           end
 
-- 
cgit v1.2.1


From 2991f93f2fdd2b6de2b307ee5ba8d8ac6651f845 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 29 Aug 2016 09:30:48 +0200
Subject: Rename CI config hidden job entry to hidden entry

---
 lib/gitlab/ci/config/node/hidden.rb     | 22 ++++++++++++++++++++++
 lib/gitlab/ci/config/node/hidden_job.rb | 22 ----------------------
 lib/gitlab/ci/config/node/jobs.rb       |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 lib/gitlab/ci/config/node/hidden.rb
 delete mode 100644 lib/gitlab/ci/config/node/hidden_job.rb

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/node/hidden.rb b/lib/gitlab/ci/config/node/hidden.rb
new file mode 100644
index 00000000000..fe4ee8a7fc6
--- /dev/null
+++ b/lib/gitlab/ci/config/node/hidden.rb
@@ -0,0 +1,22 @@
+module Gitlab
+  module Ci
+    class Config
+      module Node
+        ##
+        # Entry that represents a hidden CI/CD job.
+        #
+        class Hidden < Entry
+          include Validatable
+
+          validations do
+            validates :config, presence: true
+          end
+
+          def relevant?
+            false
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/config/node/hidden_job.rb b/lib/gitlab/ci/config/node/hidden_job.rb
deleted file mode 100644
index 19514a653b0..00000000000
--- a/lib/gitlab/ci/config/node/hidden_job.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Gitlab
-  module Ci
-    class Config
-      module Node
-        ##
-        # Entry that represents a hidden CI/CD job.
-        #
-        class HiddenJob < Entry
-          include Validatable
-
-          validations do
-            validates :config, presence: true
-          end
-
-          def relevant?
-            false
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb
index 51683c82ceb..a1a26d4fd8f 100644
--- a/lib/gitlab/ci/config/node/jobs.rb
+++ b/lib/gitlab/ci/config/node/jobs.rb
@@ -30,7 +30,7 @@ module Gitlab
 
           def compose!
             @config.each do |name, config|
-              node = hidden?(name) ? Node::HiddenJob : Node::Job
+              node = hidden?(name) ? Node::Hidden : Node::Job
 
               factory = Node::Factory.new(node)
                 .value(config || {})
-- 
cgit v1.2.1