diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-08 14:32:45 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-08 14:32:45 +0900 |
| commit | 632b87a80e4e349ffc5fde585e661f51d6bec7e4 (patch) | |
| tree | 12d463ffedcf000a112d741a0a3f5598ede48e8f /.gitignore | |
| parent | 07d1d8bd6730015e65bd5123f305bf35b4839237 (diff) | |
| parent | 0eb74426b3eeacf92cd144e6ddc336adbe43ca1e (diff) | |
| download | gitlab-ce-632b87a80e4e349ffc5fde585e661f51d6bec7e4.tar.gz | |
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e1561c9db9a..c7d1648615d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,8 @@ eslint-report.html /shared/* /.gitlab_workhorse_secret /webpack-report/ +/knapsack/ +/rspec_flaky/ /locale/**/LC_MESSAGES /locale/**/*.time_stamp /.rspec |