1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

8773 Commits

Author SHA1 Message Date
James Laska
77202ec696 Only run unit and function tests 2016-07-22 13:19:57 -04:00
James Laska
29778538c3 Be sure to install ansible
Enable the mongodb travis service too
2016-07-22 13:19:57 -04:00
James Laska
6140c8c500 Additional travis/tox tweaks
* Enable travis caching
* Disable coverage after_build
* Call setup.py develop first
* Include pytest config and enable skipsdist
2016-07-22 13:19:57 -04:00
Shane McDonald
5c516b60b3 ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
2016-07-22 13:19:57 -04:00
James Laska
f3c186310b First pass at getting tox and travis working 2016-07-22 13:19:57 -04:00
Matthew Jones
1208450f59 Merge branch 'stable' into devel
* stable:
  Update 3.0 changelogs
  Spacing in sh script on merge conflict
  Update setup for bundled ansible-2 dependencies
  fix ansible2.0 bundle deps bootstrap
  Use yum's compare_providers() function instead of just pulling the latest alphabetically.
2016-07-21 10:49:50 -04:00
Matthew Jones
7b1fd964e3 Merge branch 'release_3.0.0' into devel
* release_3.0.0: (22 commits)
  remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058)
  fix missing URI encoding in event summary serch, kickback on #2980 (#3050)
  Switch base class for StateConflict
  Fixed password show/hide on enter for survey maker password type previews
  Fixed password show/hide on enter for survey taker survey questions where type is password
  Prevent populate_user from being registered multiple times.
  Fixing iterator used when jobs list refreshes
  Explicit super user check for JT can_delete
  Fix for populating teams for LDAP user.
  Update hubspot template for marketting
  Fix up flake8
  Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal.  New solution listens for state changes within the directive and cleans itself up.
  Switch disallowed object delete to 409
  Password enter show/hide fix
  add test for CustomInventoryScript serializer
  Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide.
  Setting the local var CredentialList to the deep clone seems to be problematic.  Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017)
  Jobs list page size (#3019)
  resolves kickback on #2980 (#3008)
  add read_role to organization select_related
  ...
2016-07-18 21:16:01 -04:00
Matthew Jones
3ab8a93461 Merge branch 'release_3.0.0' into stable
* release_3.0.0: (2364 commits)
  remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058)
  fix missing URI encoding in event summary serch, kickback on #2980 (#3050)
  Switch base class for StateConflict
  Fixed password show/hide on enter for survey maker password type previews
  Fixed password show/hide on enter for survey taker survey questions where type is password
  Prevent populate_user from being registered multiple times.
  Fixing iterator used when jobs list refreshes
  Explicit super user check for JT can_delete
  Fix for populating teams for LDAP user.
  Update hubspot template for marketting
  Fix up flake8
  Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal.  New solution listens for state changes within the directive and cleans itself up.
  Switch disallowed object delete to 409
  Password enter show/hide fix
  add test for CustomInventoryScript serializer
  Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide.
  Setting the local var CredentialList to the deep clone seems to be problematic.  Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017)
  Jobs list page size (#3019)
  resolves kickback on #2980 (#3008)
  Use the correct yum attribute name
  ...
2016-07-18 20:40:13 -04:00
Leigh Johnson
62e5defac3 remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058) 2016-07-18 15:34:59 -04:00
Leigh Johnson
c0e02f4a65 fix missing URI encoding in event summary serch, kickback on #2980 (#3050) 2016-07-18 13:34:53 -04:00
Matthew Jones
b587b892b0 Switch base class for StateConflict
This fixes the output format for the 409 exception return
2016-07-18 12:29:51 -04:00
Michael Abashian
ec2cb9a3cc Merge pull request #3045 from mabashian/password-show-hide
Fixed password show/hide on enter for survey taker password
2016-07-18 12:24:25 -04:00
Michael Abashian
5894e5eb65 Fixed password show/hide on enter for survey maker password type previews 2016-07-18 10:55:18 -04:00
Michael Abashian
43fc454a95 Fixed password show/hide on enter for survey taker survey questions where type is password 2016-07-18 10:35:57 -04:00
Chris Church
cb98d0674d Prevent populate_user from being registered multiple times. 2016-07-15 16:24:41 -04:00
Alan Rominger
94e39b0cee Merge pull request #3015 from AlanCoding/org_read_role
Add read_role to organization select_related
2016-07-15 15:32:04 -04:00
Wayne Witzel III
03c3ac074c Merge pull request #3022 from wwitzel3/issue-2979
Fix sysadmin and sysauditor viewing orphan inventory script.
2016-07-15 15:26:33 -04:00
Jared Tabor
29132929de Merge pull request #3025 from jaredevantabor/jobs-list-page-size
Fixing iterator used when jobs list refreshes
2016-07-15 11:56:19 -07:00
Michael Abashian
fea1605279 Merge pull request #3026 from mabashian/backspace-job-launch
Better fix for the job launch modal backspace bug
2016-07-15 14:38:40 -04:00
Michael Abashian
e496b558df Merge pull request #3023 from mabashian/job-launch-password-enter
Job Launch/Survey Maker enter in password fields would show/hide password
2016-07-15 13:57:39 -04:00
Jared Tabor
d39538c7c4 Fixing iterator used when jobs list refreshes
it was still using the iterators used when there were four job panes
2016-07-15 10:52:14 -07:00
Matthew Jones
c36080e149 Explicit super user check for JT can_delete 2016-07-15 13:48:42 -04:00
Chris Church
62562afd0d Fix for populating teams for LDAP user. 2016-07-15 13:17:25 -04:00
Matthew Jones
df1c1ae473 Fix up flake8 2016-07-15 12:50:59 -04:00
Michael Abashian
a845904bd7 Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal. New solution listens for state changes within the directive and cleans itself up. 2016-07-15 12:12:45 -04:00
Matthew Jones
eb97b8c916 Switch disallowed object delete to 409
In the case of running job conflicts
2016-07-15 11:47:02 -04:00
Michael Abashian
e5cb497c22 Password enter show/hide fix 2016-07-15 10:45:36 -04:00
Wayne Witzel III
b9de0b196d add test for CustomInventoryScript serializer 2016-07-15 10:35:44 -04:00
Michael Abashian
c8fa2befb6 Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide. 2016-07-15 10:35:28 -04:00
Michael Abashian
8c85035d18 Setting the local var CredentialList to the deep clone seems to be problematic. Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017) 2016-07-14 23:10:26 -04:00
Jared Tabor
fc304899bd Jobs list page size (#3019)
* changing jobs list page size to 20 by default

it was previously set to 10

* adjustment to tag search check for null id
2016-07-14 23:09:46 -04:00
Leigh Johnson
73722ffb77 resolves kickback on #2980 (#3008) 2016-07-14 23:08:02 -04:00
Alan Rominger
3b972e871d Merge pull request #3014 from AlanCoding/migration_touchup
Switch order in migration 0026
2016-07-14 16:49:28 -04:00
Matthew Jones
ba444ab743 Merge branch 'release_3.0.0' into devel
* release_3.0.0: (129 commits)
  Use the correct yum attribute name
  Fix NaN / invalid end date value in schedule edit forms (#3007)
  resolves kickback on #2976 (#3009)
  Additional UI/JS licenses (#2974)
  Install at when configuring on-book AMI conf
  Added patch tests for updating project organizations
  Make development environment use ATOMIC_REQUESTS
  Team organization field made non-null
  Don't let normal users create orgless projects
  Fix up some flake8 issues
  Add delete protection from certain objects
  Cascade delete teams when their organization is deleted
  Updated tests to reflect credential access after migrations
  Changed conditonal to repair console error and page loade error
  Remove socket binding when the scope is destroyed so that we don't make errant GET requests in future instances of this controller.
  updated EULA text from rnalen
  Fix team credential role access in rbac migration
  Orphan handling in _old_access.py
  Normalized CustomInventoryScriptAccess.can_admin
  Use simplified epel-release links
  ...
2016-07-14 16:22:26 -04:00
AlanCoding
df940f811c add read_role to organization select_related 2016-07-14 16:11:29 -04:00
AlanCoding
2876bb169b switch order in migration 2016-07-14 15:49:24 -04:00
Leigh Johnson
86afd6f758 Fix NaN / invalid end date value in schedule edit forms (#3007)
* fix NAN on end date issue affecting schedule edit form, resolves #2817

* remove debug statement
2016-07-14 15:36:11 -04:00
Leigh Johnson
4ffc062d19 resolves kickback on #2976 (#3009) 2016-07-14 15:35:46 -04:00
Graham Mainwaring
8ed69d1641 Additional UI/JS licenses (#2974)
* Additional UI/JS licenses
2016-07-14 15:34:16 -04:00
Akita Noek
6eb63285d2 Merge pull request #3010 from anoek/3006
Don't let normal users create orgless projects
2016-07-14 15:25:45 -04:00
Alan Rominger
7f168c7fe4 Merge pull request #3003 from AlanCoding/2988_team_cascade
Cascade delete teams from organization
2016-07-14 15:13:46 -04:00
Alan Rominger
149e7375c0 Merge pull request #3011 from AlanCoding/docker_atomic
Make development environment use ATOMIC_REQUESTS
2016-07-14 15:07:47 -04:00
Akita Noek
41d6d19bcb Added patch tests for updating project organizations 2016-07-14 15:02:00 -04:00
AlanCoding
06c37d39ef Make development environment use ATOMIC_REQUESTS 2016-07-14 14:43:25 -04:00
AlanCoding
68d5a702af Team organization field made non-null 2016-07-14 14:38:43 -04:00
Akita Noek
e18d142533 Don't let normal users create orgless projects
#3006
2016-07-14 14:29:34 -04:00
Matthew Jones
17a27ef4a2 Merge pull request #3005 from matburt/delete_protection
Add delete protection from certain objects
2016-07-14 12:52:58 -05:00
Jared Tabor
88f0283597 Merge pull request #2996 from jaredevantabor/missing-jt
Show proper error message for missing job template form
2016-07-14 09:46:27 -07:00
Matthew Jones
c852503163 Fix up some flake8 issues 2016-07-14 12:40:37 -04:00
Matthew Jones
00e55e3813 Add delete protection from certain objects
Certain objects can be sensitive to being deleted while jobs are
running, this protects those objects
2016-07-14 12:22:33 -04:00