External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
16,689 Commits 65 Branches 102 Tags
ea7a0b2f587de39fafdd60f9aa896ba2505dd822
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III ea7a0b2f58 Fixes RBAC issue, ensures can admin of sub_obj when needed 2018-04-02 14:10:14 -04:00
Wayne Witzel III f4e57e2906 Merge pull request #1608 from wwitzel3/devel 
System Setting for Orgainization User/Team permissions.
 2018-03-20 17:17:49 -04:00
Wayne Witzel III d7f26f417d Reword help text for manage org auth 2018-03-20 07:31:08 -04:00
Wayne Witzel III d5564e8d81 Fix user capabilities when MANAGE_ORGANIZATION_AUTH is disabled 2018-03-19 15:16:54 -04:00
Wayne Witzel III a9da494904 switch to single toggle and change name 2018-03-19 14:45:52 -04:00
Wayne Witzel III 771108e298 Protect team assignment for the roles access point 2018-03-19 12:10:13 -04:00
Wayne Witzel III eb3b518507 Add Organization User/Team toggle to UI 2018-03-19 11:25:14 -04:00
Wayne Witzel III 33ac8a9668 System wide toggle for org admin user/team abilities 2018-03-19 11:24:36 -04:00
Wayne Witzel III 16aa3d724f Merge pull request #1586 from wwitzel3/devel 
Moved RelatedJobMixin impl to Project instead of ProjectUpdate
 2018-03-16 09:58:34 -04:00
Wayne Witzel III 6231742f71 Move RelatedJob mixin to Project 2018-03-16 09:42:32 -04:00
Wayne Witzel III c628e9de0a Filter active jobs by WFT/JT 2018-03-16 09:32:42 -04:00
Wayne Witzel III c54d9a9445 Fix query using self -> self.project and fix imports 2018-03-16 09:24:46 -04:00
Wayne Witzel III f594f62dfc Project needs to expose all of its ProjectUpdate jobs in an active state 2018-03-16 09:12:20 -04:00
Wayne Witzel III 4b27b05fd2 Merge pull request #1541 from wwitzel3/devel 
Fix member_role parent to include credential_admin_role
 2018-03-13 13:52:58 -04:00
Wayne Witzel III db38cf8f93 Fix member_role parent to include credential_admin_role 2018-03-13 12:20:40 -04:00
Wayne Witzel III a3b2f29478 Merge pull request #1454 from wwitzel3/fix-role-summary 
Fix role summary when role description is overloaded
 2018-03-06 14:03:22 -05:00
Wayne Witzel III 8dce5c826c Fix role summary when role description is overloaded 2018-03-06 13:07:29 -05:00
Wayne Witzel III dba78e6bfb Merge pull request #1398 from wwitzel3/devel 
Update to latest asgi-amqp
 2018-02-28 15:20:55 -05:00
Wayne Witzel III 73f0a0d147 Update to latest asgi-amqp 2018-02-28 14:43:37 -05:00
Wayne Witzel III 91c6d406c5 Rollback celery 2018-02-22 09:37:14 -05:00
Wayne Witzel III 2c71a27630 Merge pull request #1123 from wwitzel3/new-permissions 
New RBAC Roles
 2018-02-15 16:56:03 -05:00
Wayne Witzel III 30a5617825 Address PR feedback 2018-02-14 22:53:33 +00:00
Wayne Witzel III 13e777f01b Rename migration files 2018-02-10 02:52:26 +00:00
Wayne Witzel III 819b318fe5 Add Org Execute 2018-02-10 02:52:26 +00:00
Wayne Witzel III 9e7bd55579 Add Notification Admin 2018-02-10 02:52:26 +00:00
Wayne Witzel III fbece6bdde Updating and adding tests for new RBAC roles 2018-02-10 02:52:26 +00:00
Wayne Witzel III 9fdd00785f Add new RBAC role migrations 2018-02-10 02:52:26 +00:00
Wayne Witzel III b478740f28 Add Workflow Admin 2018-02-10 02:52:25 +00:00
Wayne Witzel III 109841c350 Add Credential Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III 6c951aa883 Add Inventory Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III e7e83afd00 Add Project Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III bad8c65321 Merge pull request #1074 from wwitzel3/devel 
Load Celery inspector manually when needed
 2018-01-29 12:00:24 -05:00
Wayne Witzel III 55a616cba6 Load Celery inspector manually when needed 2018-01-29 14:57:03 +00:00
Wayne Witzel III b205630490 Merge pull request #622 from wwitzel3/release_3.2.3 
Wait for Slack RTM API websocket connection to be established
 2018-01-24 08:59:45 -05:00
Wayne Witzel III aa469d730e Wait for Slack RTM API websocket connection to be established 2018-01-24 13:48:42 +00:00
Wayne Witzel III 1af0ee2f8c first-parent requires git >= 1.8.4 2018-01-18 16:12:23 +00:00
Wayne Witzel III fc5c5400cd Merge pull request #1003 from wwitzel3/devel 
Fix notification_data attempting to access name property of an int
 2018-01-18 08:55:50 -05:00
Wayne Witzel III 95bead2bb2 Extend notification_data test 2018-01-18 13:30:12 +00:00
Wayne Witzel III 4a28065dbb Fix notification_data attempting to access name property of an int 2018-01-17 21:46:49 +00:00
Wayne Witzel III 1690938dfb Update asgi-amqp requirement 2018-01-09 23:54:30 +00:00
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