Commit c98add15 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'clean_carrierwave_tempfiles' into 'master'

Clean carrierwave tempfiles

Closes #28540

See merge request !9466
parents 01adf920 ad27f204
...@@ -38,10 +38,6 @@ class FileUploader < GitlabUploader ...@@ -38,10 +38,6 @@ class FileUploader < GitlabUploader
File.join(dynamic_path_segment, @secret) File.join(dynamic_path_segment, @secret)
end end
def cache_dir
File.join(base_dir, 'tmp', @project.path_with_namespace, @secret)
end
def model def model
project project
end end
......
---
title: Periodically clean up temporary upload files to recover storage space
merge_request: 9466
author: blackst0ne
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
# Remove all files from old custom carrierwave's cache directories.
# See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9466
class RemoveOldCacheDirectories < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
disable_ddl_transaction!
def up
# FileUploader cache.
FileUtils.rm_rf(Dir[Rails.root.join('public', 'uploads', 'tmp', '*')])
end
def down
# Old cache is not supposed to be recoverable.
# So the down method is empty.
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170407140450) do ActiveRecord::Schema.define(version: 20170408033905) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
enable_extension "pg_trgm" enable_extension "pg_trgm"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment