Joshua Watt 968c2ffd1f merger: Handle merges with cherry-pick merge-mode ... Merges cannot be cherry-picked in git, so if a change is a merge, do a `git merge` instead of a cherry-pick to match how Gerrit will merge the change. Change-Id: I9bc7025d2371913b63f0a6723aff480e7e63d8a3 Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>		2022-05-11 10:06:18 -05:00
..
fixtures	Merge "Add unit test for zuul_json text result parsing"	2022-05-03 05:37:45 +00:00
remote	Add support for Ansible 5	2022-04-14 13:33:53 -07:00
unit	merger: Handle merges with cherry-pick merge-mode	2022-05-11 10:06:18 -05:00
zuul_client	Remove rpcclient from test_zuulclient	2022-01-17 12:47:31 -08:00
__init__.py	Add non-voting jobs.	2012-08-23 23:20:09 +00:00
base.py	merger: Handle merges with cherry-pick merge-mode	2022-05-11 10:06:18 -05:00
encrypt_secret.py	Make tests' encrypt_secret.py work with python3	2017-10-19 18:09:57 +00:00
fake_graphql.py	Fetch can-merge info when updating a pull-request	2020-09-23 12:03:55 +02:00
fakegithub.py	Fix bug in getting changed files	2022-04-25 15:05:48 -07:00
fakegitlab.py	Add base_sha support to gitlab driver	2022-04-25 15:05:48 -07:00
make_playbooks.py	Use libyaml if possible	2017-04-04 11:49:05 -07:00
print_layout.py	Do not add implied branch matchers in project-templates	2017-09-30 10:19:07 -07:00