summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-05 21:09:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-05 21:09:19 +0000
commitda07b341fd8d97bac03ce5cd1781c64af2175b87 (patch)
tree04e742d9988f6b7df3e2af13baebc2d19bab864a /lib/support
parent6d18e2830d07abf6f3318bd0e11a784bb67dbf52 (diff)
downloadgitlab-ce-da07b341fd8d97bac03ce5cd1781c64af2175b87.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/support')
-rw-r--r--lib/support/nginx/gitlab4
-rw-r--r--lib/support/nginx/gitlab-ssl4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 9eafa5ef008..74eb8634d58 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -7,8 +7,8 @@
## CONTRIBUTING ##
##################################
##
-## If you change this file in a Merge Request, please also create
-## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+## If you change this file in a merge request, please also create
+## a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
##
###################################
## configuration ##
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index ae5c88455e4..576c13d8d10 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -11,8 +11,8 @@
## CONTRIBUTING ##
##################################
##
-## If you change this file in a Merge Request, please also create
-## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+## If you change this file in a merge request, please also create
+## a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
##
###################################
## configuration ##