diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /lib/gitlab/template/base_template.rb | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
| download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'lib/gitlab/template/base_template.rb')
| -rw-r--r-- | lib/gitlab/template/base_template.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/template/base_template.rb b/lib/gitlab/template/base_template.rb index e84937ec4ad..b659bff52ad 100644 --- a/lib/gitlab/template/base_template.rb +++ b/lib/gitlab/template/base_template.rb @@ -23,7 +23,12 @@ module Gitlab end def content - @finder.read(@path) + blob = @finder.read(@path) + [description, blob].compact.join("\n") + end + + def description + # override with a comment to be placed at the top of the blob. end # Present for compatibility with license templates, which can replace text |