diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /.gitignore | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3120c1c1bdc..29180b76e26 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ eslint-report.html /config/gitlab.yml /config/gitlab_ci.yml /config/Gitlab.gitlab-license -/config/initializers/rack_attack.rb /config/initializers/smtp_settings.rb /config/initializers/relative_url.rb /config/resque.yml @@ -92,3 +91,6 @@ jsdoc/ webpack-dev-server.json /.nvimrc .solargraph.yml +apollo.config.js +/tmp/matching_foss_tests.txt +ee/changelogs/unreleased-ee |