fixup! override content method

2 files changed, 18 insertions, 15 deletions

diff --git a/lib/gitlab/template/base_template.rb b/lib/gitlab/template/base_template.rb
index 4086d8701bf..760ff3e614a 100644
--- a/lib/gitlab/template/base_template.rb
+++ b/lib/gitlab/template/base_template.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module Template
     class BaseTemplate
-      attr_writer :content
-
       def initialize(path)
         @path = path
       end
@@ -12,19 +10,7 @@ module Gitlab
       end
 
       def content
-        @content ||= File.read(@path)
-      end
-
-      def categories
-        raise NotImplementedError
-      end
-
-      def extension
-        raise NotImplementedError
-      end
-
-      def base_dir
-        raise NotImplementedError
+        File.read(@path)
       end
 
       class << self
@@ -39,6 +25,18 @@ module Gitlab
           directory ? new(File.join(category_directory(directory), file_name)) : nil
         end
 
+        def categories
+          raise NotImplementedError
+        end
+
+        def extension
+          raise NotImplementedError
+        end
+
+        def base_dir
+          raise NotImplementedError
+        end
+
         def by_category(category)
           templates_for_directory(category_directory(category))
         end
diff --git a/lib/gitlab/template/gitlab_ci_yml.rb b/lib/gitlab/template/gitlab_ci_yml.rb
index f1e96d22d64..7f480fe33c0 100644
--- a/lib/gitlab/template/gitlab_ci_yml.rb
+++ b/lib/gitlab/template/gitlab_ci_yml.rb
@@ -1,6 +1,11 @@
 module Gitlab
   module Template
     class GitlabCiYml < BaseTemplate
+      def content
+        explanation = "# This file is a template, and might need editing before it works on your project."
+        [explanation, super].join("\n")
+      end
+
       class << self
         def extension
           '.gitlab-ci.yml'