diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-20 08:23:20 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-20 10:16:14 -0400 |
| commit | 95aaf66ec3d2852c75451ba32123568b2bbff384 (patch) | |
| tree | cc83e9143f80cdadf1df90fe23ddd1752905f033 /lib | |
| parent | 7716c7e84a7978c8f87b14ec0c0183d68fc96366 (diff) | |
| download | gitlab-ce-95aaf66ec3d2852c75451ba32123568b2bbff384.tar.gz | |
Merge branch 'fix/import-export-prod' into 'master'
Fixed a couple of errors on import/export spotted in production
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829
A couple of tiny bugs spotted after deploying in prod
See merge request !4782
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb index 624c1766024..99cf85d9a3b 100644 --- a/lib/gitlab/import_export.rb +++ b/lib/gitlab/import_export.rb @@ -21,7 +21,7 @@ module Gitlab end def config_file - 'lib/gitlab/import_export/import_export.yml' + Rails.root.join('lib/gitlab/import_export/import_export.yml') end def version_filename |