External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 02:50:02 -03:30
Code Issues Packages Projects Releases Wiki Activity
7,063 Commits 54 Branches 19 Tags
Commit Graph

7063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leigh Johnson
1f2ecf4e0c reduce duplication in JobDetailService, use strict equiv checks where possible 2016-04-20 09:57:22 -04:00
Leigh Johnson
78907a59f8 ES6-ifty JobDetailService 2016-04-20 09:40:29 -04:00
Leigh Johnson
ec2661a7dc host summary > disable failed filter option if no hosts return failed events. Resolves #1587 
fix comment
 2016-04-20 09:40:29 -04:00
Leigh Johnson
e3d01d0967 fix a 404 on job details, linting. Resolves #1581 2016-04-20 09:40:29 -04:00
Wayne Witzel III
1e9b479855 Merge pull request #1606 from wwitzel3/bug-1553 
add Red Hat for CloudForms and Satellite 6
 2016-04-19 18:04:51 -04:00
Wayne Witzel III
320d6377d0 add Red Hat for CloudForms and Satellite 6 2016-04-19 18:03:58 -04:00
Wayne Witzel III
dd6eaf8f9b Merge pull request #1592 from wwitzel3/rbac-bug-1426 
remove extra validation on project.organization
 2016-04-19 18:00:37 -04:00
Wayne Witzel III
82464fb45b remove extra validation on project.organization, enforced in UI, but allowed in API 2016-04-19 17:59:56 -04:00
Alan Rominger
5543448a43 Merge pull request #1562 from AlanCoding/1459_org_detail_fix 
Fix index error generating organization detail view context
 2016-04-19 10:13:15 -04:00
Michael Abashian
6c7382b7b9 Merge pull request #1566 from mabashian/expand-aw-required-when 
Expanded awRequiredWhen to support expressions
 2016-04-19 08:35:42 -04:00
Akita Noek
969782fdca Merge pull request #1560 from anoek/11th-hour 
RBAC RolePermission removal updates
 2016-04-18 21:08:54 -04:00
Leigh
fd9157c9b7 Merge pull request #1544 from leigh-johnson/JobsListFields 
Job details / Jobs list feedback #1543 #1543
 2016-04-18 18:37:06 -04:00
Akita Noek
ad423e976b Bump splunk time limit up to pass tests, will fix in #1584 2016-04-18 17:58:18 -04:00
Michael Abashian
7bb7b4fd14 Changed variable to reqExpression per the update to awRequiredWhen 2016-04-18 17:10:16 -04:00
Akita Noek
043c71728c Bump our monolithic test time back up.. will try and reduce it post-merge 2016-04-18 17:06:47 -04:00
Akita Noek
41553c39bf Moved dummy data generator out to tools directory 2016-04-18 16:56:29 -04:00
Akita Noek
97f70cdbbc Merge branch 'devel' of github.com:ansible/ansible-tower into 11th-hour 2016-04-18 16:30:55 -04:00
Akita Noek
c3144dc4d3 benign 0008 migration change to make makemigrations happy 2016-04-18 16:26:11 -04:00
Akita Noek
07eccbe3e4 Migration for dropping implicit host inventory,name ordering 2016-04-18 16:22:14 -04:00
kensible
2d8b1443cb Merge pull request #1565 from kensible/1555-1554-SystemTracking 
Demo feedback - breadcrumbs, capitalization, labels. Covers 1554 + 1555.
 2016-04-18 16:00:12 -04:00
Matthew Jones
d87213705b Adjust job launch blocking logic 
Previously a job template would always block another job template launch
regardless of the details of the job template.   We now restrict that
blocking logic to only block in the case that the job template was
launched with the same inventory.   We keep the exclusion where if the
launch type is 'callback' and the limits differ then they won't be blocked
 2016-04-18 15:57:31 -04:00
Leigh Johnson
2bc822f255 post-demo feedback #1542 2016-04-18 15:54:17 -04:00
Akita Noek
96aa3e2555 Attempt 2 at making jenkins' sqlite happy 2016-04-18 15:26:09 -04:00
Akita Noek
fa98b59b6c Merge pull request #9 from AlanCoding/11th-hour 
Merge devel, update job launch behavior to newest permissions stuff
 2016-04-18 15:03:58 -04:00
AlanCoding
1a97773aa1 remove more save calls 2016-04-18 14:36:18 -04:00
Akita Noek
0349737538 Attempt at a workaround for our larger sqlite tests 
These tests are only failing on jenkins, not on our local dev
environments.
 2016-04-18 14:32:21 -04:00
Akita Noek
0cf096e5b0 Updated users.py test expectations to match our current behavior 2016-04-18 14:31:42 -04:00
AlanCoding
5abde762ae updates to prompt-for tests and logic for new RBAC updates 2016-04-18 14:29:30 -04:00
Matthew Jones
226cb9acdf Protect job template and project template notifiers in the case where 
the project or org may not be available.
 2016-04-18 14:24:53 -04:00
Akita Noek
ceff538969 Merge branch '11th-hour' of github.com:anoek/ansible-tower into 11th-hour 2016-04-18 14:12:44 -04:00
AlanCoding
9c75ced9f8 Merge branch 'devel' of https://github.com/ansible/ansible-tower into 11th-hour 2016-04-18 14:12:13 -04:00
Alan Rominger
33500f5816 Merge pull request #1431 from AlanCoding/1136_prompt_for_all_things3 
Allow prompting for several new runtime variables
 2016-04-18 14:04:11 -04:00
Matthew Jones
29875a428b Merge pull request #1558 from matburt/demo_data 
Creating pre-loaded demo data
 2016-04-18 13:54:40 -04:00
Akita Noek
f71c54f882 Merge branch 'devel' of github.com:ansible/ansible-tower into 11th-hour 2016-04-18 11:47:00 -04:00
Akita Noek
6c47aed852 Merge pull request #8 from AlanCoding/11th-hour-org-counts 
Thorough organization counts testing, un-skip
 2016-04-18 11:41:51 -04:00
Akita Noek
878455187f Optimized viewable user list, fixed up some project readability bugs 2016-04-18 11:28:46 -04:00
Matthew Jones
ba7f48abf1 Updating tests around data preload 2016-04-18 11:27:39 -04:00
Akita Noek
8b67f1d1c6 Removed team<->org role cycle 2016-04-18 11:27:22 -04:00
AlanCoding
fb013ed7f1 org counts: un-skip tests, more thorough counting 2016-04-18 11:15:05 -04:00
Michael Abashian
94c4591a3e Expanded awRequiredWhen to support an expression rather than looking at a truthy scope variable. 2016-04-18 11:09:12 -04:00
AlanCoding
333730f30e make special case for no results slightly more clear 2016-04-18 10:51:27 -04:00
Ken Hoes
6d31136bfa Demo feedback - breadcrumbs, capitalization, labels. Covers 1554 + 1555. 2016-04-18 10:00:06 -04:00
AlanCoding
500ebdbbd2 fix index error generating organization detail view context 2016-04-18 08:56:04 -04:00
kensible
4f2b245f71 Merge pull request #1470 from kensible/1045-systemTracking 
1045 System Tracking restyle
 2016-04-18 08:54:01 -04:00
Akita Noek
6d8bab97df Only rebuild ancestor list on post_* events 2016-04-18 08:53:40 -04:00
Akita Noek
2a676d80ce Handle vacuous role rebuilding condition instead of exploding 2016-04-18 08:45:44 -04:00
Akita Noek
85843cc6ad Fixed up some RBAC indexing 2016-04-17 10:20:38 -04:00
Akita Noek
a9f2507e91 flake8 2016-04-16 18:54:45 -04:00
Akita Noek
7637b51992 Merge branch 'devel' of github.com:ansible/ansible-tower into 11th-hour 2016-04-16 18:35:25 -04:00
Akita Noek
74caa18cb5 Ditch some expensive prefetching for Hosts 
This prefetching gets really expensive when we have a large number of
hosts, it's far less expensive to just go out and do subsequent queries
to pull this data in. (dropped aggregate query time down from ~2400ms to
~180ms)
 2016-04-16 18:32:54 -04:00