summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-08-01 14:34:11 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-08-01 14:36:42 +0200
commit3baf3dc955dfaad2961bba548dab940b55dfa68e (patch)
treeda2800408de827b68899e402495f4020bc6b4e40 /lib
parenta853d3e944abb7a6d60ea24381028020166760d1 (diff)
downloadgitlab-ce-3baf3dc955dfaad2961bba548dab940b55dfa68e.tar.gz
Rename GitLabProjectImporterService and misc fixes
First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/import_export.rb2
-rw-r--r--lib/gitlab/project_template.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 9f23d29218b..30b536383f9 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -17,7 +17,7 @@ module Gitlab
def import_upload_path(filename:)
milliseconds = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
- File.join(storage_path, 'uploads', "#{millisecond}-#{filename}")
+ File.join(storage_path, 'uploads', "#{milliseconds}-#{filename}")
end
def project_filename
diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb
index d90ba240fde..cf461adf697 100644
--- a/lib/gitlab/project_template.rb
+++ b/lib/gitlab/project_template.rb
@@ -24,13 +24,13 @@ module Gitlab
name == other.name && title == other.title
end
- TemplatesTable = [
+ TEMPLATES_TABLE = [
ProjectTemplate.new('rails', 'Ruby on Rails')
].freeze
class << self
def all
- TemplatesTable
+ TEMPLATES_TABLE
end
def find(name)