Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stan@gitlab.com>2018-01-04 08:42:52 +0300
committerStan Hu <stanhu@gmail.com>2018-01-17 04:04:38 +0300
commit1f96512ba189d1eceb01353ca41c1cb6216d32c1 (patch)
treee838b79b23e24ef042dc189a2112ac7ec10a8190 /app/services/projects/gitlab_projects_import_service.rb
parent8f4b06137577f868ffaa41d10c27aa1e763bc825 (diff)
Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'
Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import
Diffstat (limited to 'app/services/projects/gitlab_projects_import_service.rb')
-rw-r--r--app/services/projects/gitlab_projects_import_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb
index 4ca6414b73b..a3d7f5cbed5 100644
--- a/app/services/projects/gitlab_projects_import_service.rb
+++ b/app/services/projects/gitlab_projects_import_service.rb
@@ -26,7 +26,7 @@ module Projects
end
def tmp_filename
- "#{SecureRandom.hex}_#{params[:path]}"
+ SecureRandom.hex
end
def file