diff options
| author | nixocio <nixocio@gmail.com> | 2021-07-22 18:34:07 +0200 |
|---|---|---|
| committer | nixocio <nixocio@gmail.com> | 2021-08-02 16:40:24 +0200 |
| commit | f85b2b6352568c0437ff018749720dc811a71850 (patch) | |
| tree | e6dd00483046ce23001ac4da6fbba32c9da6fd26 /.gitignore | |
| parent | Merge pull request #10757 from rebeccahhh/instance_node_type (diff) | |
| download | awx-f85b2b6352568c0437ff018749720dc811a71850.tar.xz awx-f85b2b6352568c0437ff018749720dc811a71850.zip | |
Merge ui and ui_next in one dir
Merge ui and ui_next in one dir
See: https://github.com/ansible/awx/issues/10676
Update django .po files
Update django .po files
Run `awx-manage makemessages`.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 48b41ea40e..3b286b137d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,12 +28,12 @@ awx/ui/build_test awx/ui/client/languages awx/ui/templates/ui/index.html awx/ui/templates/ui/installing.html -awx/ui_next/node_modules/ -awx/ui_next/src/locales/*/messages.js -awx/ui_next/coverage/ -awx/ui_next/build -awx/ui_next/.env.local -awx/ui_next/instrumented +awx/ui/node_modules/ +awx/ui/src/locales/*/messages.js +awx/ui/coverage/ +awx/ui/build +awx/ui/.env.local +awx/ui/instrumented rsyslog.pid tools/prometheus/data tools/docker-compose/ansible/awx_dump.sql @@ -63,14 +63,12 @@ __pycache__ /Gruntfile.js /Brocfile.js /bower.json -/package.json /testem.yml **/coverage /.istanbul.yml **/node_modules/** /tmp **/npm-debug.log* -**/package-lock.json # UI build flag files awx/ui/.deps_built @@ -154,7 +152,7 @@ use_dev_supervisor.txt .idea/* *.unison.tmp *.# -/awx/ui_next/.ui-built +/awx/ui/.ui-built /Dockerfile /_build/ /_build_kube_dev/ |