Commit a6f35904 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'update-security-harness-script' into 'master'

Updates security-harness for Security remote

See merge request gitlab-org/gitlab!27121
parents 277830e9 136e174c
...@@ -28,9 +28,9 @@ HOOK_DATA = <<~HOOK ...@@ -28,9 +28,9 @@ HOOK_DATA = <<~HOOK
if [ -e "$harness" ] if [ -e "$harness" ]
then then
if [[ ("$url" != *"dev.gitlab.org"*) && ("$url" != *"gitlab-org/security/"*) ]] if [["$url" != *"gitlab-org/security/"*]]
then then
echo "Pushing to remotes other than dev.gitlab.org and gitlab.com/gitlab-org/security has been disabled!" echo "Pushing to remotes other than gitlab.com/gitlab-org/security has been disabled!"
echo "Run scripts/security-harness to disable this check." echo "Run scripts/security-harness to disable this check."
echo echo
...@@ -58,7 +58,7 @@ def toggle ...@@ -58,7 +58,7 @@ def toggle
else else
FileUtils.touch(harness_path) FileUtils.touch(harness_path)
puts "#{SHELL_GREEN}Security harness installed -- you will only be able to push to dev.gitlab.org or gitlab.com/gitlab-org/security!#{SHELL_CLEAR}" puts "#{SHELL_GREEN}Security harness installed -- you will only be able to push to gitlab.com/gitlab-org/security!#{SHELL_CLEAR}"
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment