diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 15:06:50 +0000 |
commit | 68d3f33d5194c446812d09f079749ddf56f95378 (patch) | |
tree | 9cb521544bf72e420a2986ca2fba512274a020eb /.gitignore | |
parent | 6a4ffad42050949fcf08e78147575734ae99627e (diff) | |
download | gitlab-ce-68d3f33d5194c446812d09f079749ddf56f95378.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b8cbfe9966d..231541a2237 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,7 @@ eslint-report.html /vendor/gitaly-ruby /builds* /.gitlab_workhorse_secret -/.gitlab_pages_shared_secret +/.gitlab_pages_secret /webpack-report/ /knapsack/ /rspec_flaky/ |