zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
32,928 Commits 35 Branches 71 Tags
8e177a29817439661fd0bc2c6017bd6bb8e72924
Commit Graph

32928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rick Elrod
8e177a2981 Ordered m2m for Inventory/Inventory relationship (#13602) 
Including changes to our custom Ordered m2m field which previously broke
if the source and target model was the same.

Signed-off-by: Rick Elrod <rick@elrod.me>
Co-authored-by: Alan Rominger <arominge@redhat.com>
 2023-03-03 10:28:56 -06:00
Sarah Akus
80e745290d Merge pull request #13629 from marshmalien/constructed-inv-edit-form 
[constructed-inventory] Add constructed inventory edit form
 2023-03-03 11:27:04 -05:00
Marliana Lara
68906849af Add constructed inventory edit form 2023-02-27 15:29:44 -05:00
Hao Liu
8e5eff2877 Merge branch 'devel' into feature_constructed-inventory 2023-02-27 08:50:30 -05:00
Hao Liu
2902b40084 Merge pull request #13623 from TheRealHaoLiu/revert-project-update-playbook 
Revert project_update.yml
 2023-02-27 08:47:24 -05:00
Hao Liu
9669b9dd2f Revert project_update.yml 
Due to problem found in testing reverting

019e6a52fe
 2023-02-27 08:23:27 -05:00
Shane McDonald
d27aada817 Merge pull request #13619 from shanemcd/non-root-path-dev-env 
Allow serving app from non-root path in dev env
 2023-02-24 09:52:34 -05:00
Shane McDonald
2fca07ee4c Allow serving app from non-root path in dev env 
Usage:

$ EXTRA_SOURCES_ANSIBLE_OPTS='-e ingress_path=/awx' make docker-compose
$ curl http://localhost:8013/awx/api/v2/ping/
 2023-02-24 09:29:17 -05:00
Marliana Lara
93043bb2b5 Merge pull request #13599 from marshmalien/constructed-inv-add-form 
Add constructed inventory add form
 2023-02-23 19:15:03 -05:00
Marliana Lara
554622e770 Add constructed inventory add form 2023-02-23 15:15:57 -05:00
Marliana Lara
1101788518 Hide constructed and smart inventories in Inventory Lookup 2023-02-23 15:08:15 -05:00
Marliana Lara
6c3986e658 Merge pull request #13589 from ansible/constructedInventoryGroups 
Adds Contructed Inventory Groups and related groups
 2023-02-23 15:07:54 -05:00
Alex Corey
e985b98d61 Adds constructed inventory groups and related groups. 2023-02-23 14:03:58 -05:00
Shane McDonald
f4bcc03ac7 Merge pull request #12242 from adpavlov/12241-websocket-custom-path 
Fix websockets when application is served from a non-root path
 2023-02-23 12:25:22 -05:00
Alexander Pavlov
5e28f5dca1 Remove trailing $ from websocket_urlpatterns to work with custom path to fix #12241 
Signed-off-by: Alexander Pavlov <alexander.pavlov@amdocs.com>
 2023-02-23 12:02:47 -05:00
Hao Liu
d088d36448 Merge pull request #13618 from TheRealHaoLiu/head-to-tail 
[fix] switch from head to tail in project update playbook when clearing project dir
 2023-02-23 11:13:03 -05:00
Hao Liu
89e41597a6 switch from head to tail 
from @relrod

`head` will close the input fd when it no longer needs it (or exits). find will try to write to the closed fd and somewhere along the way, it will receive SIGPIPE as a result. This is why `yes | head -5 ` doesn't run forever.
 2023-02-23 10:46:48 -05:00
Hao Liu
8f40c53bf2 Merge branch 'devel' into feature_constructed-inventory 2023-02-22 21:40:36 -05:00
Hao Liu
283adc30a8 Merge pull request #13526 from TheRealHaoLiu/project_update_playbook_lint 
[chore] Update project_update playbook to be compliant with ansible-lint
 2023-02-22 21:39:42 -05:00
Hao Liu
019e6a52fe Update project_update playbook to be compliant with ansible-lint 2023-02-22 19:30:24 -05:00
Hao Liu
35e5610642 Merge pull request #13615 from TheRealHaoLiu/update-kind-devel-doc 
update kind development environment instruction
 2023-02-22 19:25:03 -05:00
Hao Liu
3a303875bb update kind development environment instruction 2023-02-22 16:18:53 -05:00
Alex Corey
0fae313338 Merge pull request #13590 from ansible/constructedInventoryHosts 
Constructed inventory hosts
 2023-02-22 11:07:25 -05:00
Alan Rominger
4499a50019 Merge pull request #13595 from sean-m-sullivan/devel 
fix inventory prompt on launch for workflow nodes
 2023-02-22 10:23:02 -05:00
Marliana Lara
f1cab55051 Merge pull request #13598 from marshmalien/constructed-inventory-sync-button 
Add constructed inventory detail sync button
 2023-02-22 10:20:45 -05:00
Alex Corey
0d88cee6bf Creates constructed inventory host lists by reusing, and renaming smart inventory host list components. 2023-02-22 10:01:31 -05:00
Marliana Lara
295ec4f22a Update inventory details after inventory source sync 2023-02-21 17:47:56 -05:00
Alan Rominger
3fe46e2e27 Merge pull request #13606 from AlanCoding/copy_login 
Give proper 401 code to user not logged in
 2023-02-21 16:31:23 -05:00
Alan Rominger
6d3f39fe92 Give proper 401 code to user not logged in 2023-02-21 13:34:29 -05:00
Alan Rominger
a3233b5fdd Merge pull request #13594 from AlanCoding/approval_collection 
Add integration test and docs for workflow_approval module
 2023-02-21 09:03:17 -05:00
Hao Liu
103b4567fe Merge pull request #13600 from gamuniz/fix_validation_bug_constructed 
[constructed-inventory]Fix validation issue constructed
 2023-02-20 10:33:21 -05:00
Gabe Muniz
8ba2b1b50c [constructed-inventory]Fix validation issue constructed 2023-02-20 10:20:23 -05:00
sean-m-sullivan
fe3aa6ce2b fix inventory prompt on launch for workflow nodes 2023-02-18 23:13:46 -05:00
Marliana Lara
83ccf1dd36 Add constructed inventory detail's sync button 2023-02-18 14:51:01 -05:00
Gabriel Muniz
77ec46f6cf Merge pull request #13593 from gamuniz/fix_workflowapproval_view 
Make /api/v2/workflow_approvals/ endpoint read-only
 2023-02-17 18:19:04 -05:00
Alan Rominger
b5f240ce70 Add integration test and docs for workflow_approval module 2023-02-17 15:10:59 -05:00
Gabe Muniz
fb2647ff7b changing the signature of workflowapprovallist 
included workflow approval as a read only endpoint to pass collection tests
 2023-02-17 14:57:54 -05:00
Marliana Lara
dc049af0eb Merge pull request #13578 from marshmalien/constructed-inv-search-option 
[constructed-inventory] Add "constructed" option to search columns
 2023-02-16 13:05:22 -05:00
John Westcott IV
23a34c5dc9 Merge pull request #13466 from john-westcott-iv/ee_debugging 
Enhancing debugging of `The project could not sync because there is no Execution Environment`
 2023-02-16 08:11:30 -05:00
John Westcott IV
bef3da6fb2 Merge pull request #13304 from john-westcott-iv/limit_actions 
Only allow promote and stage to run on the awx repo
 2023-02-16 08:05:23 -05:00
Marliana Lara
8ea8558605 Add constructed inv option to search columns 2023-02-15 17:21:23 -05:00
Alan Rominger
7f50679e68 Do not create setting with invalid value in data migration (#13576) 
* Do not create setting with invalid value in data migration

* Add test for conf app data migration
 2023-02-15 14:54:46 -05:00
John Westcott IV
52d071f9d1 Merge pull request #13573 from john-westcott-iv/ldap_issue 
Fixing LDAP users not being properly added to managed teams
 2023-02-15 13:25:34 -05:00
Hao Liu
3335afcd3a Merge branch 'devel' into feature_constructed-inventory 2023-02-15 10:05:02 -05:00
Gabriel Muniz
1f2a5cf7e4 Merge pull request #13555 from gamuniz/deny_adding_constructedinventory 
[constructed-inventory] remove ability to add constructed inventories to input inventories
 2023-02-15 10:03:58 -05:00
Gabe Muniz
7f2933c43c moved fixture to conftest.py and reverted some test changes 2023-02-14 17:54:54 -05:00
John Westcott IV
26a888547d Fixing variable with duplicate name which was causing errors with LDAP team addition 2023-02-14 14:56:13 -05:00
Gabe Muniz
d55af032f7 refactored to use is_valid_relation instead of post 2023-02-14 00:08:21 -05:00
Shane McDonald
05af2972bf Merge pull request #13562 from siw36/fix-typo-generic-oidc 
Fix a typo in the help text for Generic OIDC
21.12.0 		2023-02-13 12:33:42 -05:00
Robin Klussmann
60458bebfd Fix a typo in the help text for Generic OIDC 2023-02-13 17:11:29 +01:00