summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJose <jivanvl@hotmail.com>2018-04-30 17:00:16 -0500
committerJose <jivanvl@hotmail.com>2018-04-30 17:00:16 -0500
commitd3327e0dfacd27d547ffdb3b7f4a1a76c76ae281 (patch)
tree82019118f22877ec9135d45620c9dcf8acd0579e /.gitignore
parentf48f40bf267fd0f35ba09fd3b8f30e17c0789327 (diff)
parent2f7b71df7619768220657ed47c7737f4c3e19e90 (diff)
downloadgitlab-ce-d3327e0dfacd27d547ffdb3b7f4a1a76c76ae281.tar.gz
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e9ff0048c1c..e1561c9db9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ eslint-report.html
/locale/**/*.time_stamp
/.rspec
/plugins/*
+/.gitlab_pages_secret