diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-01-19 18:43:27 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-01-19 18:43:27 +0000 |
| commit | 465f41673a418096b761d12438301c7b217f9a81 (patch) | |
| tree | 269dbda0a11cf688fe62f96b162a373767b857d5 /lib/api/files.rb | |
| parent | 2fba31890e922fa8bae61e7aa3f21c5b4314e735 (diff) | |
| parent | 02d8575a610176bbb79eac91b5ab783872ef098a (diff) | |
| download | gitlab-ce-465f41673a418096b761d12438301c7b217f9a81.tar.gz | |
Merge branch 'database-fix-setting' into 'master'
Check for database connection when running current_application_settings
The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown.
See merge request !292
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions