Skip to content

Commit

Permalink
Merge branch 'devel' into user-friendly-email-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
MBcom committed Feb 22, 2021
2 parents 2d51e6a + 9e58503 commit bda4bbe
Show file tree
Hide file tree
Showing 4,163 changed files with 299,117 additions and 233,449 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
.git
awx/ui/node_modules
6 changes: 0 additions & 6 deletions .dput.cf

This file was deleted.

20 changes: 0 additions & 20 deletions .editorconfig

This file was deleted.

1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
PYTHONUNBUFFERED=true
SELENIUM_DOCKER_TAG=latest

1 change: 1 addition & 0 deletions .github/BOTMETA.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
files:
awx/ui/:
labels: component:ui
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ https://www.ansible.com/security

##### STEPS TO REPRODUCE

<!-- For bugs, please show exactly how to reproduce the problem. For new
features, show how the feature would be used. -->
<!-- For new features, show how the feature would be used. For bugs, please show
exactly how to reproduce the problem. Ideally, provide all steps and data needed
to recreate the bug from a new awx install. -->

##### EXPECTED RESULTS

Expand Down
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: "\U0001F41B Bug report"
about: Create a report to help us improve

---
<!-- Issues are for **concrete, actionable bugs and feature requests** only - if you're just asking for debugging help or technical support, please use:
- http://webchat.freenode.net/?channels=ansible-awx
- https://groups.google.com/forum/#!forum/awx-project
We have to limit this because of limited volunteer time to respond to issues! -->

##### ISSUE TYPE
- Bug Report

##### SUMMARY
<!-- Briefly describe the problem. -->

##### ENVIRONMENT
* AWX version: X.Y.Z
* AWX install method: openshift, minishift, docker on linux, docker for mac, boot2docker
* Ansible version: X.Y.Z
* Operating System:
* Web Browser:

##### STEPS TO REPRODUCE

<!-- Please describe exactly how to reproduce the problem. -->

##### EXPECTED RESULTS

<!-- What did you expect to happen when running the steps above? -->

##### ACTUAL RESULTS

<!-- What actually happened? -->

##### ADDITIONAL INFORMATION

<!-- Include any links to sosreport, database dumps, screenshots or other
information. -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: "✨ Feature request"
about: Suggest an idea for this project

---
<!-- Issues are for **concrete, actionable bugs and feature requests** only - if you're just asking for debugging help or technical support, please use:
- http://webchat.freenode.net/?channels=ansible-awx
- https://groups.google.com/forum/#!forum/awx-project
We have to limit this because of limited volunteer time to respond to issues! -->

##### ISSUE TYPE
- Feature Idea

##### SUMMARY
<!-- Briefly describe the problem or desired enhancement. -->
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/security_bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: "\U0001F525 Security bug report"
about: How to report security vulnerabilities

---

For all security related bugs, email [email protected] instead of using this issue tracker and you will receive a prompt response.

For more information on the Ansible community's practices regarding responsible disclosure, see https://www.ansible.com/security
36 changes: 33 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@

installer/inventory
# Ignore generated schema
swagger.json
schema.json
reference-schema.json

# Tags
.tags
.tags1

# Tower
awx-dev
awx/settings/local_*.py*
awx/*.sqlite3
awx/*.sqlite3_*
Expand All @@ -22,8 +30,15 @@ awx/ui/build_test
awx/ui/client/languages
awx/ui/templates/ui/index.html
awx/ui/templates/ui/installing.html
/tower-license
/tower-license/**
awx/ui_next/node_modules/
awx/ui_next/src/locales/
awx/ui_next/coverage/
awx/ui_next/build
awx/ui_next/.env.local
awx/ui_next/instrumented
rsyslog.pid
tools/prometheus/data
tools/docker-compose/Dockerfile

# Tower setup playbook testing
setup/test/roles/postgresql
Expand Down Expand Up @@ -52,10 +67,12 @@ __pycache__
**/node_modules/**
/tmp
**/npm-debug.log*
**/package-lock.json

# UI build flag files
awx/ui/.deps_built
awx/ui/.release_built
awx/ui/.release_deps_built

# Testing
.cache
Expand All @@ -67,6 +84,7 @@ pep8.txt
scratch
testem.log
awx/awx_test.sqlite3-journal
.pytest_cache/

# Mac OS X
*.DS_Store
Expand Down Expand Up @@ -111,13 +129,25 @@ local/
*.mo
requirements/vendor
.i18n_built
VERSION
.idea/*
*credentials*.y*ml*

# AWX python libs populated by requirements.txt
awx/lib/.deps_built
awx/lib/site-packages
venv/*
use_dev_supervisor.txt


# Ansible module tests
/awx_collection_test_venv/
/awx_collection/*.tar.gz
/sanity/
/awx_collection_build/

.idea/*
*.unison.tmp
*.#
/tools/docker-compose/overrides/
/awx/ui_next/.ui-built
/Dockerfile
16 changes: 0 additions & 16 deletions .mini-dinstall.cf

This file was deleted.

6 changes: 0 additions & 6 deletions .pylintrc

This file was deleted.

12 changes: 12 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
ignore: |
.tox
awx/main/tests/data/inventory/plugins/**
# vault files
awx/main/tests/data/ansible_utils/playbooks/valid/vault.yml
awx/ui/test/e2e/tests/smoke-vars.yml

extends: default

rules:
line-length: disable
Loading

0 comments on commit bda4bbe

Please sign in to comment.