diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-03 08:16:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-03 08:16:44 +0000 |
| commit | 57430dc4da113b14989be61e30e161ae0686ff27 (patch) | |
| tree | 9de6a37343af587941cfc4652fdb106192db0a01 | |
| parent | aa27108e6bb7c3f9d0bfb891addb52680aa995e7 (diff) | |
| parent | 60c5b52ee906639e8bc0408a4a63d50862580fc8 (diff) | |
| download | gitlab-ce-57430dc4da113b14989be61e30e161ae0686ff27.tar.gz | |
Merge branch 'rs-require-backup-files' into 'master'
Explicitly require backup/files
Fixes a test failure we were seeing on CI after merging !1520
See merge request !1731
| -rw-r--r-- | lib/backup/builds.rb | 2 | ||||
| -rw-r--r-- | lib/backup/uploads.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/backup/builds.rb b/lib/backup/builds.rb index 800f30c2144..635967f4bd4 100644 --- a/lib/backup/builds.rb +++ b/lib/backup/builds.rb @@ -1,3 +1,5 @@ +require 'backup/files' + module Backup class Builds < Files def initialize diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb index 0a0ec564ba4..9261f77f3c9 100644 --- a/lib/backup/uploads.rb +++ b/lib/backup/uploads.rb @@ -1,3 +1,5 @@ +require 'backup/files' + module Backup class Uploads < Files |