diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-19 22:08:37 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-19 22:08:37 +0100 |
| commit | 5c99afcf0bb8ea3091d8155bc4d4a22534a66116 (patch) | |
| tree | b3b03cad2e4a9e0ba657d70d2833fb1a2cd17a31 /app/helpers/blob_helper.rb | |
| parent | 5d197230067edd8255b422b5970eb34bda061048 (diff) | |
| parent | 022242c30fe463d2b82c18c687088786b306415f (diff) | |
| download | gitlab-ce-5c99afcf0bb8ea3091d8155bc4d4a22534a66116.tar.gz | |
Merge branch 'master' into zj-mattermost-slash-config
Diffstat (limited to 'app/helpers/blob_helper.rb')
| -rw-r--r-- | app/helpers/blob_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 07ff6fb9488..f31d4fb897d 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -191,6 +191,10 @@ module BlobHelper @gitlab_ci_ymls ||= Gitlab::Template::GitlabCiYmlTemplate.dropdown_names end + def dockerfile_names + @dockerfile_names ||= Gitlab::Template::DockerfileTemplate.dropdown_names + end + def blob_editor_paths { 'relative-url-root' => Rails.application.config.relative_url_root, |