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	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Merge branch 'fix/ha-mode-import-issue' into 'master'	2016-08-04 12:21:53 +00:00
locales
application.rb	Merge branch 'rename-js-files' into 'master'	2016-07-20 12:26:53 +00:00
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	Update default path for repository_downloads_path in gitlab.yml.example	2016-07-21 10:31:49 -03:00
license_finder.yml	Resolve feedback.	2016-06-06 13:39:36 -06:00
mail_room.yml	Don't require Gitlab::Redis in mail_room.yml if it's already defined	2016-06-10 13:44:45 +02:00
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