External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
15,740 Commits 63 Branches 102 Tags
47e422ba7a4601de99ed1c9231577dff99318e93
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III f3310236e4 Merge pull request #599 from wwitzel3/release_3.2.2 
Fix git project sync bug.
 2017-11-30 11:22:29 -05:00
Wayne Witzel III ed28faa3db Use TMP instead of TMPDIR and only set it in RunProjectUpdate 2017-11-30 16:10:12 +00:00
Wayne Witzel III 53460db4d7 Merge pull request #736 from ewjoachim/fix-social-core 
Fix import of social_core.exceptions in sso/pipeline.py
 2017-11-29 09:26:43 -05:00
Wayne Witzel III 3202e77b57 Merge pull request #720 from wwitzel3/devel 
Update to asgi_amqp 1.0.1
 2017-11-27 14:57:39 -05:00
Wayne Witzel III a858093db8 Update to asgi_amqp 1.0.1 2017-11-27 19:41:30 +00:00
Wayne Witzel III 79c196fc08 Merge pull request #588 from wwitzel3/release_3.2.2 
Include all previously run operations to satisfy Django migration planner
 2017-11-17 12:12:21 -05:00
Wayne Witzel III 249a5e5e4d Include all previously run operations to satisfy Django migration planner. 2017-11-17 12:02:07 -05:00
Wayne Witzel III e5d86419c8 Merge pull request #582 from AlanCoding/smart_computed2 
update smart inventory computed fields
 2017-11-16 19:36:08 -05:00
Wayne Witzel III 9ed2a0da8f Merge pull request #627 from wwitzel3/devel 
Fix image_build
 2017-11-14 08:53:21 -05:00
Wayne Witzel III d696f6c3f6 Fix image_build 2017-11-13 19:11:58 -05:00
Wayne Witzel III 3cdeb446c4 Merge pull request #622 from wwitzel3/devel 
Using metavar with a flag is not allowed or useful
 2017-11-13 17:12:03 -05:00
Wayne Witzel III 58737a8e28 Using metavar with a flag is not allowed or useful 2017-11-13 16:05:54 -05:00
Wayne Witzel III 2fb74f5b02 Merge pull request #621 from wwitzel3/devel 
Fix mgmt cmds, use real types not strings
 2017-11-13 15:38:19 -05:00
Wayne Witzel III 768a3f62f1 Fix mgmt cmds, use real types not strings 2017-11-13 15:32:31 -05:00
Wayne Witzel III d9f8f7721a Fix installer references to asgi_amqp 2017-11-13 13:39:39 -05:00
Wayne Witzel III d2711f4af0 Merge pull request #618 from wwitzel3/devel 
Silence models.E006 until rename the Project and InventorySource
 2017-11-13 13:23:15 -05:00
Wayne Witzel III 77fd7ea4a8 Silence models.E006 until we can rename the Project and InventorySource models 2017-11-13 13:19:29 -05:00
Wayne Witzel III faa5a5e024 Merge pull request #600 from wwitzel3/django111 
Upgrade AWX major dependencies
 2017-11-13 12:26:04 -05:00
Wayne Witzel III 798d27c2cb Fix task_manager test 2017-11-13 12:02:00 -05:00
Wayne Witzel III 5b4dc9e7ee Disable group sending in consumer (Issue ansible/awx#615) 2017-11-13 10:19:14 -05:00
Wayne Witzel III f118e27047 Flake8 fixes and URL updates 2017-11-10 17:04:33 -05:00
Wayne Witzel III 96904968d8 Fix migration issues, tests, and templates 2017-11-09 17:29:48 -05:00
Wayne Witzel III 6d6bbbb627 Update URL strucuture, fixed string based calls 2017-11-09 17:24:04 -05:00
Wayne Witzel III 14c5123fda Update celery environ and tasks 2017-11-09 17:21:19 -05:00
Wayne Witzel III de376292ba Update management commands 2017-11-09 17:18:18 -05:00
Wayne Witzel III 8faf588775 Update package versions, settings, and tooling 2017-11-09 17:17:30 -05:00
Wayne Witzel III 7149c41804 Merge pull request #570 from wwitzel3/release_3.2.2 
Handle ProgrammingError in squashed helpers
 2017-11-03 10:45:09 -04:00
Wayne Witzel III 1a5b5c32b8 Handle ProgrammingError in squashed helpers 2017-11-03 10:34:25 -04:00
Wayne Witzel III 1b44ca8ef4 Merge pull request #569 from wwitzel3/release_3.2.2 
Handle programming error when evaluating the replaces list for 320
 2017-11-03 09:02:58 -04:00
Wayne Witzel III d7f4707044 Handle programming error when evaluating the replaces list for 320 2017-11-03 08:53:53 -04:00
Wayne Witzel III ce393da6fd Merge pull request #564 from wwitzel3/squashbillies 
Squashbillies - Fixing direct upgrades from 3.0/3.1 bug fix revisions.
 2017-11-02 16:19:26 -04:00
Wayne Witzel III 2f86774006 3.2.0 should not have any replacements defined unless 0005a or 0005b migrations have been run previously 2017-11-02 16:11:45 -04:00
Wayne Witzel III f9685717b8 Move post 3.0 migrations to pre 3.1 position in migration files 2017-11-02 14:06:36 -04:00
Wayne Witzel III 47a3ba9bd5 Rename squash 300 to 30 2017-11-02 14:06:36 -04:00
Wayne Witzel III af3e6f792c Rename squash 310 to 31 2017-11-02 14:06:35 -04:00
Wayne Witzel III fc56a1c170 Fix 3.0 to 3.2 migration paths 2017-11-02 14:06:35 -04:00
Wayne Witzel III 84fb908261 Fix 3.1 to 3.2 migration paths 2017-11-02 14:06:33 -04:00
Wayne Witzel III 470a4b7746 Merge pull request #535 from wwitzel3/release_3.2.2 
use getattr in social auth django strategy
 2017-10-18 11:02:11 -04:00
Wayne Witzel III 38c2ea7025 use getattr in social auth django strategy 2017-10-18 10:20:44 -04:00
Wayne Witzel III 8f883d8d43 Fix migrations to support 3.1.2 -> 3.2.1+ upgrade path 2017-10-06 09:25:43 -04:00
Wayne Witzel III 5bcf704b76 Merge pull request #501 from wwitzel3/release_3.2.1 
[3.2.1] Fix missing update_capacity paramenter
 2017-10-06 00:37:07 -04:00
Wayne Witzel III 2818bb5833 fix missing parameter to update_capacity method 2017-10-06 00:23:12 -04:00
Wayne Witzel III 02e3f45422 do not allow ansible connection type of local for ad_hoc 2017-10-04 17:55:36 -04:00
Wayne Witzel III 96fd07d0f3 Assert isolated nodes have capacity set to 0 and restored based on version 2017-10-02 14:43:19 -04:00
Wayne Witzel III 692007072d Set capacity to zero if the isolated node has an old version 2017-10-02 14:43:18 -04:00
Wayne Witzel III e233926a4a Merge pull request #467 from wwitzel3/release_3.2.0 
add --comment-only option to the migrate_to_database_settings mgmt cmd
 2017-09-26 19:07:46 -04:00
Wayne Witzel III ba23f1728a add --comment-only option to the migrate_to_database_settings mgmt command 2017-09-26 14:51:59 -04:00
Wayne Witzel III 0b0afe91ab Merge pull request #457 from wwitzel3/release_3.2.0 
get_or_create already saves, no need to call again
 2017-09-22 16:42:47 -04:00
Wayne Witzel III 39cc427668 get_or_create already saves, no need to call again 2017-09-22 16:25:55 -04:00
Wayne Witzel III 9e9692971f Merge pull request #455 from wwitzel3/release_3.2.0 
Various SAML / auth fixes.
 2017-09-22 16:10:49 -04:00
Wayne Witzel III e9e027ecd7 Fix issue when the enterprise_auth has already been created 2017-09-22 15:58:39 -04:00
Wayne Witzel III 723449818d Fix issue when per user tokens are disabled 2017-09-22 15:58:26 -04:00
Wayne Witzel III 7960525c20 Merge pull request #440 from wwitzel3/release_3.2.0 
Merge pull request #224 from wwitzel3/fix-shared-deps
 2017-09-20 16:50:08 -04:00
Wayne Witzel III 439beeab3b Merge pull request #224 from wwitzel3/fix-shared-deps 
Fix job shared dependencies.
 2017-09-20 14:56:22 -04:00
Wayne Witzel III e6777577b6 Merge pull request #224 from wwitzel3/fix-shared-deps 
Fix job shared dependencies.
 2017-09-20 14:21:39 -04:00
Wayne Witzel III 095a93d895 remove duplicated get_latest calls 2017-09-20 13:57:01 -04:00
Wayne Witzel III 0f4523fabf Fix up unit and functional tests 2017-09-20 13:22:41 -04:00
Wayne Witzel III 2889df8013 ensure project sync/inv updates are added to the dependencies 2017-09-20 13:15:02 -04:00
Wayne Witzel III 11b2bc33fe add scheduler module __init__ 2017-09-20 13:14:01 -04:00
Wayne Witzel III 1beaccb9c9 move TaskManager out of init 2017-09-20 13:13:10 -04:00
Wayne Witzel III c868f7e91f Merge pull request #435 from wwitzel3/release_3.2.0 
just fall through to the DjangoStrategy constructor
 2017-09-20 09:02:58 -04:00
Wayne Witzel III bab4cbbcf7 just fall through to the DjangoStrategy constructor 2017-09-20 08:50:39 -04:00
Wayne Witzel III 2ea1aee8ba Merge pull request #218 from subuk/devel 
Fix typo in AWXDjangoStrategy constructor
 2017-09-20 08:48:56 -04:00
Wayne Witzel III 540bda1d09 Merge pull request #420 from wwitzel3/release_3.2.0 
Merge pull request #161 from wwitzel3/devel
 2017-09-18 09:54:54 -04:00
Wayne Witzel III dafd6acf1a Merge pull request #161 from wwitzel3/devel 
update social auth strategy to have fixes from social-app-django
 2017-09-15 17:22:32 -04:00
Wayne Witzel III 7c7c7db345 Merge pull request #161 from wwitzel3/devel 
update social auth strategy to have fixes from social-app-django
 2017-09-13 23:00:41 -04:00
Wayne Witzel III 5cc0552b05 remove AWXDjangoStrategy in the future 2017-09-13 21:28:26 -04:00
Wayne Witzel III f44adb98cb update social auth strategy to have fixes from social-app-django 2017-09-13 21:16:10 -04:00
Wayne Witzel III 50e3a9dee6 Merge pull request #142 from wwitzel3/devel 
Update ISSUES.md and bot metadata
 2017-09-12 16:19:38 -04:00
Wayne Witzel III c2b4756a4f Merge pull request #10 from wwitzel3/botdoc 
Update ISSUES.md with bot doc
 2017-09-12 14:07:18 -04:00
Wayne Witzel III 8e22bc2ce5 Update ISSUES.md with bot doc 2017-09-12 13:58:35 -04:00
Wayne Witzel III 2882ac4da8 extend api maintainers folder to main 2017-09-12 13:40:17 -04:00
Wayne Witzel III b0d7a16f49 Add docs and PR labels 2017-09-12 13:37:57 -04:00
Wayne Witzel III c695234ed1 Merge pull request #134 from wwitzel3/devel 
Add PR template and tweak `make VERSION` output to be pastable
 2017-09-12 11:32:41 -04:00
Wayne Witzel III f1c9d5a8f4 Add PR template and tweak make VERSION output to be pastable 2017-09-12 09:56:35 -04:00
Wayne Witzel III e00c65072b fix issue template section, component => component name 2017-09-11 18:15:56 -04:00
Wayne Witzel III 3118092e51 Merge pull request #113 from matburt/waiting_install_screen 
Integrate a migration-detector middleware
 2017-09-11 12:55:10 -04:00
Wayne Witzel III d3ca35ac42 Fix component labels to match defaults in issue template. 2017-09-11 07:40:23 -04:00
Wayne Witzel III 66865c8b63 Update .github metadata for awxbot 2017-09-10 00:22:08 -04:00
Wayne Witzel III 0da416b141 Merge pull request #46 from swills/install-req-gmake-git 
add missing build deps
 2017-09-08 10:36:29 -04:00
Wayne Witzel III a825c84521 Merge pull request #61 from Numblesix/devel 
Ensure Docker is running fixes #59
 2017-09-08 09:34:18 -04:00
Wayne Witzel III a8841e2e2b Merge pull request #60 from FooBarQuaxx/patch-1 
Fixed typo in supervisor autorestart option
 2017-09-08 09:22:22 -04:00
Wayne Witzel III 05b4bff388 Merge pull request #322 from wwitzel3/issue-7501 
Update HostManager to return distinct hostnames
 2017-08-22 16:31:57 -04:00
Wayne Witzel III ca9a1a0ca1 remove tests that execute distinct logic, sqlite3 does not support 2017-08-21 06:16:44 -04:00
Wayne Witzel III f8c2b466a8 sometimes core_filters is not an attribute, so just set it to empty instead of pop 2017-08-21 06:03:37 -04:00
Wayne Witzel III eb6a27653f Adjust HostManager and update summary host query 2017-08-21 04:01:58 -04:00
Wayne Witzel III c352ea7596 Update HostManager to return only a single matching hostname for SmartInventory filter 2017-08-21 02:17:27 -04:00
Wayne Witzel III ba1ed5b6fd Merge pull request #293 from wwitzel3/release_3.2.0 
Provide history to hosts that are part of smart inventory jobs.
 2017-08-17 09:58:32 -04:00
Wayne Witzel III 67c25570f3 Ensure Smart Inventory hosts are assigned job history 2017-08-16 17:04:17 -04:00
Wayne Witzel III 3ce0529846 Merge pull request #152 from wwitzel3/issue-7355 
Ensure hosts list properly when given read access to a smart inventory
 2017-08-02 15:41:13 -04:00
Wayne Witzel III eb73248d37 Refactor InventoryHostsList get_queryset to use getattrd 2017-08-02 15:13:27 -04:00
Wayne Witzel III 7f75ef9ad4 whitespace clean up 2017-08-02 13:11:16 -04:00
Wayne Witzel III fe36ed94b8 Ensure hosts list properly when given read access to a smart inventory 2017-08-02 13:10:55 -04:00
Wayne Witzel III 78ab549733 Merge pull request #115 from wwitzel3/issue-7332 
Disable caching for /authtoken endpoint
 2017-07-31 10:00:04 -04:00
Wayne Witzel III 7fe9c7b913 Disable caching for /authtoken endpoint 2017-07-31 09:19:54 -04:00
Wayne Witzel III 6856c77a8e Merge pull request #89 from wwitzel3/release_3.2.0 
Backout the token websocket changes, can of worms.
 2017-07-27 13:16:14 -04:00
Wayne Witzel III 5d167cafa2 Revert "Merge pull request #39 from wwitzel3/issue-7260" 
This reverts commit 6cd0592781, reversing
changes made to 943a40eb40.
 2017-07-27 11:32:09 -04:00
Wayne Witzel III 6cd0592781 Merge pull request #39 from wwitzel3/issue-7260 
Fixing cookie settings for CSRF and auth token
 2017-07-26 18:58:37 -04:00
Wayne Witzel III eff62a17a4 No longer require the token for channels 2017-07-26 13:57:14 -04:00
Wayne Witzel III f6d59409de Fixing cookie settings for CSRF and auth token 2017-07-25 10:11:52 -04:00