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
23aee0ca
Commit
23aee0ca
authored
9 years ago
by
Eric Maziade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed connection detection so settings can be read from the database
parent
de3b7d9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+1
-1
No files found.
lib/gitlab/current_settings.rb
View file @
23aee0ca
...
@@ -4,7 +4,7 @@ module Gitlab
...
@@ -4,7 +4,7 @@ module Gitlab
key
=
:current_application_settings
key
=
:current_application_settings
RequestStore
.
store
[
key
]
||=
begin
RequestStore
.
store
[
key
]
||=
begin
if
ActiveRecord
::
Base
.
connect
ed
?
&&
ActiveRecord
::
Base
.
connection
.
table_exists?
(
'application_settings'
)
if
ActiveRecord
::
Base
.
connect
ion
.
active
?
&&
ActiveRecord
::
Base
.
connection
.
table_exists?
(
'application_settings'
)
ApplicationSetting
.
current
||
ApplicationSetting
.
create_from_defaults
ApplicationSetting
.
current
||
ApplicationSetting
.
create_from_defaults
else
else
fake_application_settings
fake_application_settings
...
...
This diff is collapsed.
Click to expand it.
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