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

12359 Commits

Author SHA1 Message Date
Shane McDonald
7e1eeb994b Add make targets for vendoring python requirements 2017-03-15 11:04:54 -04:00
Shane McDonald
f79cd028f0 Add separate requirements file for setup_requires stuff
pip doesnt know how to resolve setup_requires dependencies.

we need this for offline pip installs when building in brew
2017-03-15 11:04:54 -04:00
Shane McDonald
c94f294d06 Use --ignore-installed when creating virtualenvs 2017-03-15 11:04:54 -04:00
Shane McDonald
fbb6650ad0 Add PIP_OPTIONS
This will allow us to conditionally pass in things like --no-index and --find-links, which will be necessary for building in Brew.
2017-03-15 11:04:54 -04:00
Shane McDonald
092c0b739e Simplify requirements targets
AFAIK, there is never a situation where VENV is going to be unset.
2017-03-15 11:04:54 -04:00
Shane McDonald
4742cede0d Add pip and setuptools to requirements files
These packages were getting silently updated, making vendoring these dependencies difficult.

This ensures that the expected versions of these packages are installed in the virtualenvs.
2017-03-15 11:04:54 -04:00
Michael Abashian
7f8bbb66ef Merge pull request #5724 from mabashian/canEditOrg-fixes
Users can interact with organization field when adding
2017-03-15 10:56:14 -04:00
Michael Abashian
2c3531f539 Merge pull request #5707 from mabashian/5690-job-event-scrollbar
Host event scrollbar fix
2017-03-15 10:03:03 -04:00
Michael Abashian
1c2535f050 Users can interact with organization field when adding 2017-03-15 10:02:33 -04:00
Ryan Petrello
a5b786b3f7 Merge pull request #5720 from ryanpetrello/callback-plugin-tests
add callback plugin tests to CI
2017-03-15 09:40:33 -04:00
Jared Tabor
e5e5fea632 Merge pull request #5721 from jaredevantabor/insights-project
Making Insights credential required on projects form
2017-03-14 13:55:35 -07:00
jaredevantabor
5041fe5bf7 changing readonlye UX for extra vars on workflow results and job results
by changing background and cursor type
2017-03-14 13:45:39 -07:00
jlmitch5
1c266b6ab5 Merge pull request #5605 from jlmitch5/cleanupProjects
Cleanup projects
2017-03-14 15:56:09 -04:00
John Mitchell
f78410ec2d update app.js to remove helpers 2017-03-14 15:30:09 -04:00
John Mitchell
0929413989 delete helpers that showed back up in rebase 2017-03-14 15:25:08 -04:00
Greg Considine
34503a18bd Merge pull request #5708 from gconsidine/fix/job-prompt-revert-selection
Fix/job prompt revert selection
2017-03-14 15:23:36 -04:00
John Mitchell
36f09d2bb6 update di's of project controllers 2017-03-14 15:03:23 -04:00
John Mitchell
75ee34153d fix jshint 2017-03-14 15:03:23 -04:00
John Mitchell
4963ae5308 rid ourselves of the project status form 2017-03-14 15:03:23 -04:00
John Mitchell
75820064e8 modularize project form 2017-03-14 15:02:34 -04:00
John Mitchell
9a0e409abf move projects list to module 2017-03-14 15:01:28 -04:00
Chris Meyers
8d2b3b2b82 Merge pull request #5705 from chrismeyersfsu/fix-5700
add job cancel dependency information
2017-03-14 15:00:15 -04:00
Greg Considine
377b55dd2f Fix typo in reference to 2017-03-14 14:51:20 -04:00
Ryan Petrello
ba9ce56c35 add callback plugin tests to CI 2017-03-14 14:07:56 -04:00
Ryan Petrello
66c786b971 simplify memcache patching in our callback plugin tests 2017-03-14 14:07:53 -04:00
jaredevantabor
081a545158 making insights credential required on projects page
and changing label to "Credential" instead of "Red Hat Insights"
2017-03-14 10:49:46 -07:00
Matthew Jones
bc4174adf8 Ignore .retry files for project updates 2017-03-14 13:23:14 -04:00
Greg Considine
d4addb83df Add logic to unset watchers using scope on destroy 2017-03-14 13:22:47 -04:00
Ryan Petrello
7a11d85b72 Merge pull request #5714 from ryanpetrello/callback-plugin-tests
add tests for our custom ansible callback plugin
2017-03-14 13:14:14 -04:00
Ryan Petrello
a5ea468bfe add a test to ensure that job events properly strip out environment vars
see: #5601
2017-03-14 12:56:44 -04:00
Ryan Petrello
5bbb824865 add tests for no_log filtering
see: #5691
2017-03-14 12:56:44 -04:00
Ryan Petrello
1005782ee9 add tests for our custom ansible callback plugin 2017-03-14 12:56:40 -04:00
jlmitch5
ad40e509e4 Merge pull request #5694 from jlmitch5/addOrgToPermModal
add org to user/team perm modal
2017-03-14 11:18:35 -04:00
Michael Abashian
d8592fc1f2 Merge pull request #5704 from mabashian/5677-rbac-org
Admin/non-org admin edit org in various resources bug fix
2017-03-14 09:51:28 -04:00
Wayne Witzel III
3b1556c0d5 Merge pull request #5709 from wwitzel3/issue-5702
correct unintentional stripping of - from order by fields
2017-03-13 22:35:18 -04:00
Matthew Jones
47a894a339 Fix up cloudforms license unit test 2017-03-13 21:02:36 -04:00
Wayne Witzel III
ea1c4ee1d5 correct unintentional stripping of - from order by fields 2017-03-13 18:13:55 -04:00
Greg Considine
5d9f27db62 Fix default selection logic and revert link style
The default selection wasn't represented in the UI for inventory
and credential prompts, and the UI wasn't updated when revert
was clicked. This addresses those bugs and adjust the style of
the revert link to increase padding-left.
2017-03-13 17:40:40 -04:00
Greg Considine
1e5af1212d Add anchor tag in place of button 2017-03-13 17:40:29 -04:00
Wayne Witzel III
4fef391914 Merge pull request #5660 from wwitzel3/release_3.1.2
do not install psql as a tower dep
2017-03-13 16:43:23 -04:00
Matthew Jones
5270b830c9 Fixing CloudForms branding 2017-03-13 16:27:30 -04:00
Shane McDonald
90e30d348f Revert "Dont ignore installed packages when installing requirements"
This reverts commit 4ffc1a41f454d511fc523aaf8d3ab65dbe45c80e.
2017-03-13 16:21:27 -04:00
Matthew Jones
3510954254 Merge pull request #5703 from ansible/cloudforms_licensing
Implement cloudforms license
2017-03-13 16:16:21 -04:00
Michael Abashian
6fbb9c4da3 Roll back binding - didn't mean to commit this as it was for debugging 2017-03-13 16:13:20 -04:00
Michael Abashian
7b2b695fc6 Host event scrollbar fix 2017-03-13 16:08:55 -04:00
Shane McDonald
4875d60b97 Dont ignore installed packages when installing requirements
This was causing some packages to get unexpectedly upgraded... probably not what we want.
2017-03-13 16:00:47 -04:00
jlmitch5
f37765c2e9 Merge branch 'devel' into addOrgToPermModal 2017-03-13 15:35:56 -04:00
Graham Mainwaring
4082cb4e60 Merge pull request #5706 from ghjm/setup_params
Allow passing ansible-playbook parameters transparently through setup.sh
2017-03-13 15:14:39 -04:00
Chris Meyers
33dca18119 more tests 2017-03-13 15:05:33 -04:00
Chris Meyers
a051b41773 add test 2017-03-13 14:45:20 -04:00