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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
33ebf5ba
Commit
33ebf5ba
authored
Sep 15, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix undefined method errors
parent
3089a558
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/system_check/app/elasticsearch_check.rb
lib/system_check/app/elasticsearch_check.rb
+2
-2
lib/tasks/gitlab/shell.rake
lib/tasks/gitlab/shell.rake
+1
-1
No files found.
lib/system_check/app/elasticsearch_check.rb
View file @
33ebf5ba
...
@@ -8,13 +8,13 @@ module SystemCheck
...
@@ -8,13 +8,13 @@ module SystemCheck
def
self
.
current_version
def
self
.
current_version
@current_version
||=
begin
@current_version
||=
begin
client
=
Gitlab
::
Elastic
::
Client
.
build
(
current_application_settings
.
elasticsearch_config
)
client
=
Gitlab
::
Elastic
::
Client
.
build
(
Gitlab
::
CurrentSettings
.
current_application_settings
.
elasticsearch_config
)
Gitlab
::
VersionInfo
.
parse
(
client
.
info
[
'version'
][
'number'
])
Gitlab
::
VersionInfo
.
parse
(
client
.
info
[
'version'
][
'number'
])
end
end
end
end
def
skip?
def
skip?
!
current_application_settings
.
elasticsearch_indexing?
!
Gitlab
::
CurrentSettings
.
current_application_settings
.
elasticsearch_indexing?
end
end
def
check?
def
check?
...
...
lib/tasks/gitlab/shell.rake
View file @
33ebf5ba
...
@@ -132,7 +132,7 @@ namespace :gitlab do
...
@@ -132,7 +132,7 @@ namespace :gitlab do
end
end
def
ensure_write_to_authorized_keys_is_enabled
def
ensure_write_to_authorized_keys_is_enabled
return
if
current_application_settings
.
authorized_keys_enabled
return
if
Gitlab
::
CurrentSettings
.
current_application_settings
.
authorized_keys_enabled
puts
authorized_keys_is_disabled_warning
puts
authorized_keys_is_disabled_warning
...
...
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