diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
| commit | ad68bc63b5e7e8080e82d9febec05397c802d33d (patch) | |
| tree | d9508d5bd96c8087d13b88051637bb442e877659 /lib/gitlab/import_export.rb | |
| parent | 41c06c311b9c5642f6056d0b34030980ebf507b3 (diff) | |
| parent | cc322603945816ed957da7c0efa56e2ef1016569 (diff) | |
| download | gitlab-ce-ad68bc63b5e7e8080e82d9febec05397c802d33d.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# app/models/project.rb
# db/schema.rb
# lib/gitlab/import_export/import_export_reader.rb
Diffstat (limited to 'lib/gitlab/import_export.rb')
| -rw-r--r-- | lib/gitlab/import_export.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb index 9c04a3d6995..624c1766024 100644 --- a/lib/gitlab/import_export.rb +++ b/lib/gitlab/import_export.rb @@ -20,6 +20,10 @@ module Gitlab "project.bundle" end + def config_file + 'lib/gitlab/import_export/import_export.yml' + end + def version_filename 'VERSION' end |