Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ec4a4f06
Commit
ec4a4f06
authored
Jan 08, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'current-settings-handle-missing-db' into 'master'
See merge request !2346
parents
b64ec38a
8d7a968d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+3
-0
No files found.
lib/gitlab/current_settings.rb
View file @
ec4a4f06
...
...
@@ -41,6 +41,9 @@ module Gitlab
use_db
&&
ActiveRecord
::
Base
.
connection
.
active?
&&
!
ActiveRecord
::
Migrator
.
needs_migration?
&&
ActiveRecord
::
Base
.
connection
.
table_exists?
(
'application_settings'
)
rescue
ActiveRecord
::
NoDatabaseError
false
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment