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	Minor fixes after a final look at the diff.	2016-05-11 10:30:47 +05:30
application.rb	Merge branch 'rename-js-files' into 'master'	2016-07-20 12:26:53 +00:00
aws.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
boot.rb	Enable the Rubocop DeprecatedClassMethods cop	2016-05-08 15:33:34 -06:00
database.yml.env	Improving the "Environment variables" administration doc	2016-02-01 19:10:46 +01:00
database.yml.mysql	set the collation to utf8_general_ci	2014-08-13 14:45:23 +01:00
database.yml.postgresql	Remove 'socket' example PostgreSQL parameter	2014-07-01 18:27:50 +02:00
dependency_decisions.yml	Whitelist 'Simplified BSD' license	2016-07-26 15:25:15 -06:00
environment.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
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	Revert "Remove newrelic gem. Closes #12860"	2016-02-23 07:25:37 -08:00
resque.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
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	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
sidekiq.yml.example	bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this	2016-02-18 18:58:51 +00:00
unicorn.rb.example	Fix typos and grammar	2016-02-10 12:43:19 +02:00
unicorn.rb.example.development	Increase unicorn timeout to 60 seconds	2014-09-23 17:11:16 +03:00