From c617cc6b66945e6c2d26e04ed0f63117e3e482bb Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Wed, 17 Apr 2019 19:02:11 +0200 Subject: [PATCH] Ignore artifacts from master If executing either `bin/test` in railties or `yarn build` in actioncable, some build artifacts are left over. The master branch git ignores those correctly. However, checking out 5-2-stable means I'll suddenly have to deal with them. Let's just ignore those artifacts here too. Proof: ``` kaspth@kaspth-imac:~/code/rails (5-2-stable)$ git status On branch 5-2-stable Your branch is up to date with 'origin/5-2-stable'. Untracked files: (use "git add ..." to include in what will be committed) actioncable/app/javascript/ railties/test/isolation/assets/ tmp/ ``` --- .gitignore | 1 + actioncable/.gitignore | 1 + railties/.gitignore | 1 + 3 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ab9ca8a6ac..2e17977b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ debug.log node_modules/ package-lock.json pkg/ +/tmp/ diff --git a/actioncable/.gitignore b/actioncable/.gitignore index f514e58c16..5d5c867f2d 100644 --- a/actioncable/.gitignore +++ b/actioncable/.gitignore @@ -1,2 +1,3 @@ +/app/javascript/action_cable/internal.js /lib/assets/compiled/ /tmp/ diff --git a/railties/.gitignore b/railties/.gitignore index c08562e016..17a49da08c 100644 --- a/railties/.gitignore +++ b/railties/.gitignore @@ -2,4 +2,5 @@ /test/500.html /test/fixtures/tmp/ /test/initializer/root/log/ +/test/isolation/assets/yarn.lock /tmp/ -- GitLab