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
6e62aab2
Commit
6e62aab2
authored
Sep 07, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Relax the custom git config check for Geo secondaries
parent
ed92fc8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
lib/system_check/app/git_user_default_ssh_config_check.rb
lib/system_check/app/git_user_default_ssh_config_check.rb
+2
-2
spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
...ystem_check/app/git_user_default_ssh_config_check_spec.rb
+9
-0
No files found.
lib/system_check/app/git_user_default_ssh_config_check.rb
View file @
6e62aab2
...
...
@@ -10,10 +10,10 @@ module SystemCheck
]
.
freeze
set_name
'Git user has default SSH configuration?'
set_skip_reason
'skipped (
git user is not present or
configured)'
set_skip_reason
'skipped (
Geo secondary, or git user is not present /
configured)'
def
skip?
!
home_dir
||
!
File
.
directory?
(
home_dir
)
Gitlab
::
Geo
.
secondary?
||
!
home_dir
||
!
File
.
directory?
(
home_dir
)
end
def
check?
...
...
spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
View file @
6e62aab2
...
...
@@ -34,6 +34,15 @@ describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
it
{
is_expected
.
to
eq
(
expected_result
)
}
end
# EE-only
it
'skips Geo secondaries'
do
stub_user
stub_home_dir
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary?
).
and_return
(
true
)
is_expected
.
to
be_truthy
end
end
describe
'#check?'
do
...
...
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