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
cff72930
Commit
cff72930
authored
Jun 15, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails5 fix connection execute return integer instead of string
parent
6d4a0325
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/rails5-fix-db-check.yml
changelogs/unreleased/rails5-fix-db-check.yml
+5
-0
lib/gitlab/health_checks/db_check.rb
lib/gitlab/health_checks/db_check.rb
+1
-1
No files found.
changelogs/unreleased/rails5-fix-db-check.yml
0 → 100644
View file @
cff72930
---
title
:
Rails5 fix connection execute return integer instead of string
merge_request
:
19901
author
:
Jasper Maes
type
:
fixed
lib/gitlab/health_checks/db_check.rb
View file @
cff72930
...
@@ -17,7 +17,7 @@ module Gitlab
...
@@ -17,7 +17,7 @@ module Gitlab
def
check
def
check
catch_timeout
10
.
seconds
do
catch_timeout
10
.
seconds
do
if
Gitlab
::
Database
.
postgresql?
if
Gitlab
::
Database
.
postgresql?
ActiveRecord
::
Base
.
connection
.
execute
(
'SELECT 1 as ping'
)
&
.
first
&
.
[
](
'ping'
)
ActiveRecord
::
Base
.
connection
.
execute
(
'SELECT 1 as ping'
)
&
.
first
&
.
[
](
'ping'
)
&
.
to_s
else
else
ActiveRecord
::
Base
.
connection
.
execute
(
'SELECT 1 as ping'
)
&
.
first
&
.
first
&
.
to_s
ActiveRecord
::
Base
.
connection
.
execute
(
'SELECT 1 as ping'
)
&
.
first
&
.
first
&
.
to_s
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