gitlab-org--gitlab-foss/config
Rémy Coutable b2d142c4a0 Merge branch 'fix/ha-mode-import-issue' into 'master'
Fix Import/Export not working in HA mode

Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [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 !5618
2016-08-04 12:21:53 +00:00
..
environments
initializers Merge branch 'fix/ha-mode-import-issue' into 'master' 2016-08-04 12:21:53 +00:00
locales
application.rb
aws.yml.example
boot.rb
database.yml.env
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml Whitelist 'Simplified BSD' license 2016-07-26 15:25:15 -06:00
environment.rb
gitlab.yml.example
license_finder.yml
mail_room.yml
newrelic.yml
resque.yml.example
routes.rb Allow branch names ending with .json for graph and network page (!5579) 2016-08-02 03:32:28 +02:00
secrets.yml.example
sidekiq.yml.example
unicorn.rb.example
unicorn.rb.example.development