Commit Graph

9394 Commits

Author SHA1 Message Date
Bill Nottingham 8677c5cceb Merge pull request #3626 from wenottingham/devel
Update help text to reflect 3.0 remove: default change
2016-09-30 15:52:29 -04:00
Chris Church 70e489d62f Save settings.LICENSE as dict instead of str. 2016-09-30 15:30:34 -04:00
AlanCoding 2faafa8071 Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-30 10:06:23 -04:00
AlanCoding 2776a56043 bump migration after another one was merged 2016-09-30 09:03:31 -04:00
Bill Nottingham cc4025977f Update help text to reflect 3.0 remove: default change 2016-09-29 17:01:11 -04:00
Chris Meyers 16ef45f096 Merge pull request #3624 from chrismeyersfsu/improvement-allow_simultaneous
Improvement allow simultaneous
2016-09-29 16:36:51 -04:00
Chris Meyers 9cafebd8db remove job to jt allow_simultaneous dependency
* Foreshadowing of what's to come with the task manager. When deciding
on what job to run in our task manager, we can't depend on job template
fields. Otherwise, this would cost us a query.
2016-09-29 16:19:19 -04:00
Chris Meyers 1a60dd89bd add back in removed method 2016-09-29 16:01:51 -04:00
Chris Meyers ec2b0ac90d add back in removed method 2016-09-29 16:01:15 -04:00
Matthew Jones be18737802 Merge branch 'ha_installer' into devel
* ha_installer:
  Fixing up some minor nits with ha setup playbook
  Update postgres yum/apt repo locations
  Add note about when to use short/long name
  Setup playbook modifications for HA/Ramparts
2016-09-29 12:29:25 -04:00
Matthew Jones a648beba90 Rev django security version 2016-09-29 12:03:06 -04:00
Matthew Jones 6b0e337886 Update postgres yum/apt repo locations
*Thanks postgres team
2016-09-29 11:25:08 -04:00
Chris Meyers dd3c3c9f29 Merge branch 'feature-ha_task_manager' into devel 2016-09-29 10:27:17 -04:00
Chris Meyers fbc1dff4de flake8 fixes 2016-09-29 10:23:00 -04:00
Chris Meyers bdd444fb44 removed print 2016-09-29 09:53:36 -04:00
Aaron Tan cf39f28d62 Merge pull request #3238 from jangsutsr/3088_make_admin_visible_to_oprhaned_users
Make system admin and system auditor visible to oprhaned users.
2016-09-29 09:42:05 -04:00
Graham Mainwaring bcc9d3a3ac Merge pull request #3611 from ghjm/makefile-flagfiles
Add Makefile flag file for ui-release
2016-09-28 17:25:52 -04:00
Alan Rominger e8903456f8 Merge pull request #3616 from AlanCoding/capabilities_fixes
Fixes to user_capabilities from QE bugs
2016-09-28 16:29:42 -04:00
Aaron Tan 3acaca376a Merge pull request #3615 from jangsutsr/3486_notification_failure_wrt_unicode_jt_name
Convert notification_subject from byte string to unicode.
2016-09-28 16:26:21 -04:00
Aaron Tan e3d27bf593 Merge pull request #3613 from jangsutsr/3534_job_host_summary_missing
Set up post_process flag for JobEvent save in callback receiver.
2016-09-28 16:25:55 -04:00
Alan Rominger 29308b08f0 Merge pull request #3571 from AlanCoding/3570_user_self_access_list
Fix user access_list bug
2016-09-28 16:20:04 -04:00
AlanCoding 2f205a6862 show capabilities on launch and relaunch, remove unintended capabilities 2016-09-28 16:02:00 -04:00
Aaron Tan eaa6567cf3 Convert notification_subject from byte string to unicode. 2016-09-28 15:51:34 -04:00
AlanCoding 37270bfb13 block system JT from being used in workflows 2016-09-28 15:14:27 -04:00
AlanCoding 78fc6df59d fix up the PATCH scenario with the char_prompts in WFJT node 2016-09-28 15:02:05 -04:00
Aaron Tan 38f5ae21f8 Set up post_process flag for JobEvent save in callback receiver. 2016-09-28 14:14:29 -04:00
Graham Mainwaring f6c50cc63a Update Makefile so that ui-release does not get rebuilt over and over when troubleshooting build/release processes 2016-09-28 12:38:37 -04:00
Chris Church 17f70fbc21 Merge pull request #3606 from cchurch/fix-ldap-saml-defaults
Fix default value validation for LDAP/SAML settings to prevent warnings.
2016-09-28 11:11:46 -04:00
Chris Church 7e7b9fb095 Merge pull request #3603 from cchurch/fix-3602
Allow skipping errors when migrating to database settings
2016-09-28 11:10:35 -04:00
Chris Church 0ce7b31502 Fix default value validation for LDAP/SAML settings to prevent warnings. 2016-09-28 11:04:35 -04:00
Chris Meyers 0d538f8b0f Revert "removed wait_task look restriction"
This reverts commit f159fd45406c6af2aacc48a44e2a3993bfa19ce8.
2016-09-28 10:23:45 -04:00
Chris Church 0007ef2546 Add --skip-errors option to migrate_to_database_settings command, allow any false/null value for 'off' in pendo setting. 2016-09-28 09:58:19 -04:00
AlanCoding 8036e294dd move vars validation method into validators.py 2016-09-28 09:49:17 -04:00
AlanCoding 166053e0eb Merge branch 'devel' into wf_rbac_prompt 2016-09-28 09:10:13 -04:00
AlanCoding 6f7e61a5be bump migration number 2016-09-28 09:09:26 -04:00
Chris Church d76fd9b860 Merge pull request #3525 from cchurch/tower-db-settings
Configure Tower in Tower
2016-09-27 23:17:14 -04:00
Wayne Witzel III 258ddba333 add channels to reqs and defaults 2016-09-27 18:39:19 -04:00
Wayne Witzel III b448621387 adding asgi.py 2016-09-27 18:39:16 -04:00
Wayne Witzel III 5faa21b72d add group_name to channel data 2016-09-27 18:39:14 -04:00
Wayne Witzel III ee09d881a4 only discard if groups have been created previously 2016-09-27 18:39:12 -04:00
Wayne Witzel III 850934c89d remove reply_channel from groups 2016-09-27 18:39:09 -04:00
Wayne Witzel III 4c8aaf1aed converting from socketio to channels websocket 2016-09-27 18:39:07 -04:00
Wayne Witzel III 42aab8ab83 removing websocket notification and service 2016-09-27 18:39:05 -04:00
Wayne Witzel III 74f9372c69 updating pyOpenSSL and cffi versions for django-channels 2016-09-27 18:39:02 -04:00
Wayne Witzel III 62beb24d62 adding initial testing consumers/routes for channels 2016-09-27 18:38:59 -04:00
AlanCoding a452acf214 include scan job_type errors in criteria for rejecting workflow node prompts 2016-09-27 17:24:09 -04:00
James Laska c4c1429989 Add bzip2 as a UI build dependency 2016-09-27 16:25:32 -04:00
Chris Meyers d65120538d scheduler messages need not be durable 2016-09-27 16:05:30 -04:00
Chris Meyers 89250dcf36 removed wait_task look restriction 2016-09-27 16:04:00 -04:00
Chris Meyers 3a8033dec4 cheesy global lock 2016-09-27 14:16:18 -04:00