diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
| commit | 27cc95ab499c08b634990b4c9266bb5ac6b64734 (patch) | |
| tree | 6a401b3d11fd6f7728253dca2e0c2e31548808ed /vendor/gitignore/Rails.gitignore | |
| parent | 5e2219db48719af5ca971f9222fffa7bd66cb6d8 (diff) | |
| parent | 08b2e7cd8f69603075edcb93a6a66b6407beb700 (diff) | |
| download | gitlab-ce-27cc95ab499c08b634990b4c9266bb5ac6b64734.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source
Diffstat (limited to 'vendor/gitignore/Rails.gitignore')
| -rw-r--r-- | vendor/gitignore/Rails.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/gitignore/Rails.gitignore b/vendor/gitignore/Rails.gitignore index e97427608c1..42aeb55000a 100644 --- a/vendor/gitignore/Rails.gitignore +++ b/vendor/gitignore/Rails.gitignore @@ -8,7 +8,7 @@ capybara-*.html /public/system /coverage/ /spec/tmp -**.orig +*.orig rerun.txt pickle-email-*.html |