Merge branch 'ce-5987-group-file-templates' into 'master'

CE backport of changes to suppport group file templates

See merge request gitlab-org/gitlab-ce!22310

1 files changed, 5 insertions, 5 deletions

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index f7e087a6234..ff7f1e3a9aa 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -183,23 +183,23 @@ module BlobHelper
   end
   private :template_dropdown_names
 
-  def licenses_for_select(project = @project)
+  def licenses_for_select(project)
     @licenses_for_select ||= template_dropdown_names(TemplateFinder.build(:licenses, project).execute)
   end
 
-  def gitignore_names(project = @project)
+  def gitignore_names(project)
     @gitignore_names ||= template_dropdown_names(TemplateFinder.build(:gitignores, project).execute)
   end
 
-  def gitlab_ci_ymls(project = @project)
+  def gitlab_ci_ymls(project)
     @gitlab_ci_ymls ||= template_dropdown_names(TemplateFinder.build(:gitlab_ci_ymls, project).execute)
   end
 
-  def dockerfile_names(project = @project)
+  def dockerfile_names(project)
     @dockerfile_names ||= template_dropdown_names(TemplateFinder.build(:dockerfiles, project).execute)
   end
 
-  def blob_editor_paths(project = @project)
+  def blob_editor_paths(project)
     {
       'relative-url-root' => Rails.application.config.relative_url_root,
       'assets-prefix' => Gitlab::Application.config.assets.prefix,