diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-11-24 03:31:08 +0100 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-11-24 03:31:08 +0100 |
| commit | dc62441ffd47d63f342c6accbd5049f6e8f99303 (patch) | |
| tree | e77f70d50b62d2a0b694638c60f238043850c2d8 /app | |
| parent | 05876a49c67fd94777801c09129e7dd77873e668 (diff) | |
| download | gitlab-ce-dc62441ffd47d63f342c6accbd5049f6e8f99303.tar.gz | |
Backport EE changes to make test possible when prepending modules
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/hashed_storage/migrate_attachments_service.rb | 4 | ||||
| -rw-r--r-- | app/services/projects/hashed_storage/migrate_repository_service.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/services/projects/hashed_storage/migrate_attachments_service.rb b/app/services/projects/hashed_storage/migrate_attachments_service.rb index 93f44110605..8cac6221a96 100644 --- a/app/services/projects/hashed_storage/migrate_attachments_service.rb +++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb @@ -17,6 +17,10 @@ module Projects move_folder!(old_path, new_path) project.save! + + if block_given? + yield + end end private diff --git a/app/services/projects/hashed_storage/migrate_repository_service.rb b/app/services/projects/hashed_storage/migrate_repository_service.rb index da43877a185..7212e7524ab 100644 --- a/app/services/projects/hashed_storage/migrate_repository_service.rb +++ b/app/services/projects/hashed_storage/migrate_repository_service.rb @@ -35,6 +35,10 @@ module Projects project.repository_read_only = false project.save! + if result && block_given? + yield + end + result end |