diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-15 19:21:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-15 19:21:35 +0000 |
| commit | 686381f7e6a7f037350ee0b37dd423eef2f10071 (patch) | |
| tree | 36ad2ec4dbff29b6475899c4e98ac58bc9f2290d /app | |
| parent | 3b9e58953f5e846280d7f14a87a9816c24c1cc8d (diff) | |
| parent | 9b86006ca160b5edc05f4b5c67d9f4efc61ca877 (diff) | |
| download | gitlab-ce-686381f7e6a7f037350ee0b37dd423eef2f10071.tar.gz | |
Merge branch 'fix/project-export-filename' into 'master'
add project name and namespace to filename on project export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19848
Export filename now includes project and namespace path
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5268
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/import_export/export_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb index 6afc048576d..998789d64d2 100644 --- a/app/services/projects/import_export/export_service.rb +++ b/app/services/projects/import_export/export_service.rb @@ -10,7 +10,7 @@ module Projects def save_all if [version_saver, project_tree_saver, uploads_saver, repo_saver, wiki_repo_saver].all?(&:save) - Gitlab::ImportExport::Saver.save(shared: @shared) + Gitlab::ImportExport::Saver.save(project: project, shared: @shared) notify_success else cleanup_and_notify |