summaryrefslogtreecommitdiff
path: root/app/helpers/projects_helper.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-04-06 13:40:30 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-04-06 13:40:30 +0000
commit88f33a1266ca51d48272e858c399daedd837575f (patch)
tree9c0da433d01a0cf01cdc0ded774c8b85a949403f /app/helpers/projects_helper.rb
parentb3ea598b1aeaf7f3eb0071b60f97247ad67e69f4 (diff)
parent8199ff7bd71ce91fbc945b2c31010fcf654bda67 (diff)
downloadgitlab-ce-update-trace-handling-code.tar.gz
Merge branch 'master' into 'update-trace-handling-code'update-trace-handling-code
# Conflicts: # app/assets/javascripts/build.js
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r--app/helpers/projects_helper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index bd0c2cd661e..6b9e4267281 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -407,7 +407,10 @@ module ProjectsHelper
def sanitize_repo_path(project, message)
return '' unless message.present?
- message.strip.gsub(project.repository_storage_path.chomp('/'), "[REPOS PATH]")
+ exports_path = File.join(Settings.shared['path'], 'tmp/project_exports')
+ filtered_message = message.strip.gsub(exports_path, "[REPO EXPORT PATH]")
+
+ filtered_message.gsub(project.repository_storage_path.chomp('/'), "[REPOS PATH]")
end
def project_feature_options