1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 18:21:12 +03:00
Commit Graph

9018 Commits

Author SHA1 Message Date
Jared Tabor
646a9f1570 Update Pendo service for 3.0 changes to retreiving the config endpoint 2016-09-07 15:53:41 -07:00
Matthew Jones
48e15d98b5 Merge branch 'release_3.0.2' into stable
* release_3.0.2: (150 commits)
  Updating changelogs for 3.0.2 release
  fixing deprecated_team.organization credential migration
  Fix issue when installing bundled ansible on el6
  fixed localed date stuff
  update test to check org_auditor access
  ensure team organizations are assigned to credentials
  temporarily pin the pytest version until the ldap error can be fixed
  fixed locale
  fix date locale angular scheduler
  Make sure org admins can see credential after migration, comment updates on related tests add clause in test to verify automatic setting of org of new team credential
  Update team admin credential migration test to current state-of-knowledge
  fix ng-toast rel, resolves #3197 (#3316)
  allow users to edit their first and last name
  Revert "Prevent ignored task from being displayed as failing."
  Revert "Modify job event save behavior"
  fixing old tests for new user creation permissions
  Clean venv on 'make clean'
  Resolve KeyError by coercing instance_id to a str
  Update cloudforms dynamic inventory
  Update foreman inventory script
  ...
2016-08-31 14:30:58 -04:00
Wayne Witzel III
de0a885972 Merge pull request #3378 from wwitzel3/release_3.0.2
fixing deprecated_team.organization credential migration
2016-08-30 14:51:03 -04:00
Wayne Witzel III
fd9d05d5df fixing deprecated_team.organization credential migration 2016-08-30 14:21:16 -04:00
Alan Rominger
c87637ea7d Merge pull request #3325 from AlanCoding/temporary_pytest_bump
Temporary pytest bump for tower unit tests
2016-08-26 12:58:48 -04:00
John Mitchell
baa2481944 fixed localed date stuff 2016-08-26 11:49:31 -04:00
Wayne Witzel III
fbcd14d40b Merge pull request #3347 from wwitzel3/issue-3305
Ensure deprecated_team.org is passed to credential.
2016-08-26 09:45:38 -04:00
Chris Church
eb70d8d32e Merge pull request #3255 from cchurch/my-saml-done-froze-up
Initialize xmlsec once to prevent SAML auth from hanging.
2016-08-25 23:32:19 -04:00
Wayne Witzel III
18e4a33404 update test to check org_auditor access 2016-08-25 13:45:13 -04:00
Wayne Witzel III
dbe3f628d4 ensure team organizations are assigned to credentials 2016-08-25 13:44:55 -04:00
AlanCoding
50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
John Mitchell
d7b79c5f08 fixed locale 2016-08-24 11:50:56 -04:00
jlmitch5
0baeafa1f1 fix date locale angular scheduler 2016-08-24 11:39:16 -04:00
AlanCoding
23024c8fad Make sure org admins can see credential after migration, comment updates on related tests
add clause in test to verify automatic setting of org of new team credential
2016-08-24 11:36:07 -04:00
Alan Rominger
75f513e591 Merge pull request #3324 from AlanCoding/3305_test_update
Update team admin credential migration test
2016-08-23 16:40:31 -04:00
Wayne Witzel III
efa8496407 Merge pull request #3301 from wwitzel3/release_3.0.2
remove last_name and first_name from admin_only fields
2016-08-23 15:17:35 -04:00
Wayne Witzel III
c963035178 Merge pull request #3302 from wwitzel3/fix-3153
prevent non-superusers from adding orphan users
2016-08-23 15:16:57 -04:00
AlanCoding
bb3e370e56 Update team admin credential migration test to current state-of-knowledge 2016-08-23 14:14:48 -04:00
Leigh Johnson
034f266b07 fix ng-toast rel, resolves #3197 (#3316) 2016-08-23 13:48:10 -04:00
Graham Mainwaring
f36ff01a5b Merge pull request #3312 from ghjm/make_clean_venv
Clean venv on 'make clean'
2016-08-23 10:47:47 -04:00
Wayne Witzel III
2fb386b23c allow users to edit their first and last name 2016-08-23 09:55:00 -04:00
Matthew Jones
965827ca4e Merge pull request #3318 from ansible/revert-3244-3199_ignored_task_result_inconsistent
Revert "Prevent ignored task from being displayed as failing."
2016-08-22 13:37:15 -04:00
Matthew Jones
e40a482cc9 Merge pull request #3317 from ansible/revert-3307-3199_2_change_job_event_save_behavior
Revert "Modify job event save behavior"
2016-08-22 13:37:04 -04:00
Matthew Jones
6cf567e4fd Revert "Prevent ignored task from being displayed as failing." 2016-08-22 13:34:52 -04:00
Matthew Jones
16fce59512 Revert "Modify job event save behavior" 2016-08-22 13:34:08 -04:00
Matthew Jones
81447df1b1 Merge pull request #3309 from jakemcdermott/bug-3308
update setup.sh option parser such that -r doesn't expect an argument
2016-08-22 11:44:19 -04:00
Wayne Witzel III
706e98c392 fixing old tests for new user creation permissions 2016-08-19 18:54:56 -04:00
Graham Mainwaring
f5b4c63173 Clean venv on 'make clean' 2016-08-19 16:28:09 -04:00
Aaron Tan
871ae0f5c7 Merge pull request #3307 from jangsutsr/3199_2_change_job_event_save_behavior
Modify job event save behavior
2016-08-19 16:20:13 -04:00
James Laska
08c4c9647b Resolve KeyError by coercing instance_id to a str
Related #3300
2016-08-19 15:37:28 -04:00
James Laska
188f81ef3d Update cloudforms dynamic inventory
Pulling the latest from
https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.py

Related #3168
2016-08-19 15:37:28 -04:00
James Laska
a847495bea Update foreman inventory script
Per request from Red Hat Satellite team, update to the latest foreman.py

https://github.com/theforeman/foreman_ansible_inventory/blob/master/foreman_ansible_inventory.py
2016-08-19 15:37:28 -04:00
jangsutsr
5b00bb14ca Modify job event save behavior 2016-08-18 18:59:33 -04:00
Leigh Johnson
fc1ca378d1 Disable permissions tab in Credential > Edit form if Credential is private (#3288)
* disable permissions tab in credential > edit view if credential is private, resolves #3265

* add tooltip indicating why permissions tab is disabled if cred is private
2016-08-18 13:49:05 -04:00
Michael Abashian
b25cf0b5cb Merge pull request #3299 from mabashian/3196-skip-tags-help-text
Tweaked the popover text for job and skip tags on JT add/edit
2016-08-18 11:39:38 -04:00
Wayne Witzel III
cef7f5a165 prevent non-superusers from adding orphan users 2016-08-18 09:55:20 -04:00
Michael Abashian
52803d2f04 Tweaked the popover text for job and skip tags on JT add/edit 2016-08-17 16:38:29 -04:00
Akita Noek
19fbe4b7fd Merge pull request #3274 from anoek/3081
Prevent private credentials from being to assigned to teams
2016-08-17 15:57:59 -04:00
Matthew Jones
3beef1d988 Workaround a cascade setnull polymorphic issue
See: https://github.com/django-polymorphic/django-polymorphic/issues/229
2016-08-17 12:55:12 -04:00
Akita Noek
6464f6e3d6 flake8 2016-08-16 15:54:12 -04:00
Akita Noek
91cd32d304 Fixed old test expectations 2016-08-16 15:36:07 -04:00
Akita Noek
9c5c09169e Made it so the credential organization field can't be changed
This makes it so the credential organizaiton field can't be changed
through the API (unless the user is a super user). This brings us into
alignment with the original intent.
2016-08-16 15:32:29 -04:00
Akita Noek
fc7d2b6c4e Skip some unit tests
These tests broke because we added some additional checks that utilize
the database within the role assignment code, and because of issue
parsing or forming requets between the unit framework and the django
request code I'd guess (for some reason it looks like the `pk` field
isn't getting parsed out and handed in to the kwargs of a post method..
didn't dig into it though.)
2016-08-16 14:53:53 -04:00
Akita Noek
30451f230b Fixed org auditor visibility of team credentials
And by fix, I mean prevent us from getting into the situation that was
causing the asymetric visiblity by brining us into alignment with the
original intention and spec for how credentials were supposed behave.

 #3081
2016-08-16 14:02:09 -04:00
Akita Noek
db87e3cb30 Merge branch 'release_3.0.2' into 3081 2016-08-16 13:52:57 -04:00
Chris Church
ff9945037f Initialize xmlsec once to prevent SAML auth from hanging. 2016-08-15 14:50:53 -04:00
Aaron Tan
fd26cf6176 Merge pull request #3244 from jangsutsr/3199_ignored_task_result_inconsistent
Prevent ignored task from being displayed as failing.
2016-08-14 20:14:06 -04:00
John Mitchell
5467b233eb fix credential kind options for list 2016-08-12 16:29:11 -04:00
Alan Rominger
e5a1ee8b94 Merge pull request #3215 from AlanCoding/2200_job_survey_pass
Save survey passwords in job as new field
2016-08-12 14:04:29 -04:00
Alan Rominger
b3c8333867 Merge pull request #3230 from ansible/AlanCoding-patch-1
Allow for 201 callback status code
2016-08-12 11:30:11 -04:00