summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-12-08 16:59:09 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-12-08 16:59:09 +0100
commitfafac3b4128a0993b0de1c6e8ca3062bf1ccc14e (patch)
tree3b9a446e4c82bb8ba94c1cd0adec57c0042dae28 /.gitignore
parent521bce7eff5cf921156efe74c91a0499ade43619 (diff)
Revert "[#801] Merge branch 'signup'"
This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore36
1 files changed, 17 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index 7b1d856c..0c347bf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,37 +3,35 @@
*.log
*.DS_Store
*.egg-info
-/web-ui/lib/
-/web-ui/node_modules
-/web-ui/public/bower_components/
-/web-ui/public/images/
-/web-ui/public/signup.js
-/web-ui/public/*.min.js
+web-ui/node_modules
+web-ui/app/bower_components
+web-ui/target
.tmp
.sass-cache/
+dist/
*archive.zip
*.swp
*.swo
-/web-ui/public/js/generated
-/web-ui/public/css
+web-ui/app/js/generated
+web-ui/app/css
test-results.xml
-/control_tower.html
-/state.yml
-*.pid
+control_tower.html
+state.yml
+.server.pid
*archive.zip
artifacts/
-/public/
+public/
.DS_Store
-/screenshot*
+screenshot*
*.pyc
-/env/
+env/
.vagrant/
__pycache__/
.virtualenv
# custom config file that can be used with the useragent
/config
-/credentials.ini
-/pixelated.cfg
-/service/_trial_temp/
-/_trial_temp
-/web-ui/coverage
+credentials.ini
+pixelated.cfg
+service/_trial_temp/
+_trial_temp
+web-ui/coverage