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
Boxiang Sun
gitlab-ce
Commits
6a56bec7
Commit
6a56bec7
authored
Aug 24, 2017
by
Maxim Rydkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace `is_gitlab_user?` with `gitlab_user?`
parent
48389b4e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/system_check/app/git_config_check.rb
lib/system_check/app/git_config_check.rb
+1
-1
lib/tasks/gitlab/task_helpers.rb
lib/tasks/gitlab/task_helpers.rb
+2
-2
No files found.
lib/system_check/app/git_config_check.rb
View file @
6a56bec7
...
@@ -20,7 +20,7 @@ module SystemCheck
...
@@ -20,7 +20,7 @@ module SystemCheck
# Returns true if all subcommands were successful (according to their exit code)
# Returns true if all subcommands were successful (according to their exit code)
# Returns false if any or all subcommands failed.
# Returns false if any or all subcommands failed.
def
repair!
def
repair!
return
false
unless
is_
gitlab_user?
return
false
unless
gitlab_user?
command_success
=
OPTIONS
.
map
do
|
name
,
value
|
command_success
=
OPTIONS
.
map
do
|
name
,
value
|
system
(
*
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
config --global
#{
name
}
#{
value
}
)
)
system
(
*
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
config --global
#{
name
}
#{
value
}
)
)
...
...
lib/tasks/gitlab/task_helpers.rb
View file @
6a56bec7
...
@@ -104,7 +104,7 @@ module Gitlab
...
@@ -104,7 +104,7 @@ module Gitlab
Gitlab
.
config
.
gitlab
.
user
Gitlab
.
config
.
gitlab
.
user
end
end
def
is_
gitlab_user?
def
gitlab_user?
return
@is_gitlab_user
unless
@is_gitlab_user
.
nil?
return
@is_gitlab_user
unless
@is_gitlab_user
.
nil?
current_user
=
run_command
(
%w(whoami)
).
chomp
current_user
=
run_command
(
%w(whoami)
).
chomp
...
@@ -114,7 +114,7 @@ module Gitlab
...
@@ -114,7 +114,7 @@ module Gitlab
def
warn_user_is_not_gitlab
def
warn_user_is_not_gitlab
return
if
@warned_user_not_gitlab
return
if
@warned_user_not_gitlab
unless
is_
gitlab_user?
unless
gitlab_user?
current_user
=
run_command
(
%w(whoami)
).
chomp
current_user
=
run_command
(
%w(whoami)
).
chomp
puts
" Warning "
.
color
(
:black
).
background
(
:yellow
)
puts
" Warning "
.
color
(
:black
).
background
(
:yellow
)
...
...
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