-

*   a9261da (origin/master, origin/HEAD) Merge pull request #48 from terabyte/cmyers/proposed-workaround-issue-41
|\  
| * e48ac48 (origin/cmyers/proposed-workaround-issue-41) [Issue #41] Synchronize PRM table accesses
| * f041893 Attempting to write a test to catch the race
|/  
* d0462fe (tag: 2.1.0) Fix DOMAIN_VERSION to be long, even when building on a tag
*   c0fb6f8 Merge pull request #46 from memory/add-reason-to-triggers-bbs4
|\  
| * 97fd389 (memory/add-reason-to-triggers-bbs4) abuse javascript to pass buildref in from trigger links
|/  
*   06401ab Merge pull request #42 from memory/fixes-for-carl
|\  
| * 57ba4ee (memory/fixes-for-carl) Fix two exceptions
* |   62af209 Merge pull request #45 from terabyte/feature/immutable
|\ \  
| * | 94834b7 (origin/feature/immutable) Immutability is good
| * | 455b11b Updating docs for slack functionality
| * | 17c0ef9 (memory/slack-support-for-carl) Slack Notifications support
| |/  
* |   3091450 Merge pull request #43 from memory/fix-postbuild-bug
|\ \  
| |/  
|/|   
| * 3ab7792 (memory/fix-postbuild-bug) workaround for upstream plugin bug
|/  
*   d016116 (HEAD -> master, memory/upstream/terabyte) Merge pull request #37 from terabyte/feature/fix-pr-link
|\  
| * 88f8c73 Fix #36 - trigger PR build link broken after bitbucket migration
|/  
*   6de94e1 Merge pull request #35 from terabyte/feature/forward-port
|\  
| * 1bf85dd (origin/feature/forward-port) Remove superfluous fetch
| * e0fec95 use pull-request refspec in verify_pr job
|/  
*   a612e4c Merge pull request #32 from terabyte/backporting-merge-base
|\  
* \   618b589 Merge pull request #27 from terabyte/feature/fix-build-reporting
|\ \  
| * | fd6c6ce (origin/feature/fix-build-reporting) Correcting build key to include full jenkins path when folders enabled
| * | 87b09a0 Use more precise time in description for build status
|/ /  
* | c666797 set default refspec for verify builds to support cross-repo PRs
* |   4ba6ea9 Merge pull request #18 from memory/default-deactivate
|\ \  
* \ \   33f6e95 Merge pull request #15 from terabyte/feature/issue-12
|\ \ \  
| * | | 60c6e7b (origin/feature/issue-12) Making folder prefix @NotNull so it can't cause NPEs later
| * | | 3a64f68 Fix build links when folders are in use
* | | |   1435ba6 Merge pull request #14 from terabyte/feature/bitbucket-porting
|\ \ \ \  
| |/ / /  
| * | | d9addc9 (origin/feature/bitbucket-porting) Update generated-test-resources.zip for bitbucket migration
| * | | 4de643d (tag: 2.0.0) Migrate stashbot to bitbucket 4.X
|/ / /  
| | | * c695063 (memory/master) Fix two exceptions
| | | * fd3a507 Merge pull request #2 in THIR/stashbot from OE-2191_merge-in-40-support to master
| | | *   18a8e07 Merge branch 'upstream/terabyte-stash-3.x-backports'
| | | |\  
| | | * | 6a35e92 abuse javascript to pass buildref in from trigger links
| | | * | 9f85c99 Merge pull request #1 in THIR/stashbot from enable-build-timeout to master
| | | * |   235d7c5 Merge branch 'verify_pr_refspec'
| | | |\ \  
| | | * \ \   b1e32e3 Merge branch 'verify-pr-refspec'
| | | |\ \ \  
| | | * \ \ \   b407606 Merge branch 'default-deactivate'
| | | |\ \ \ \  
| | |_|/ / / /  
| |/| | | | |   
| | | * | | | f477580 fix job links for real
| | | * | | |   76404eb Merge branch 'upstream/terabyte-stash-3.x-backports'
| | | |\ \ \ \  
| | | | * \ \ \   4a3ed88 Merge pull request #24 from memory/fix-build-links
| | | | |\ \ \ \  
| | | | | * | | | 8f6bb14 fix generation of links to prefixed/foldered jobs
| | | | |/ / / /  
| | | * | | | | eb20cac set climate defaults
| |_|/ / / / /  
|/| | | | | |   
| | | | | | | * 108fbbd (memory/add-reason-to-triggers) ajax all the things
| | | | | | | * 2032281 abuse javascript to pass buildref in from trigger links
| | | | | | |/  
| | | | | | | *   d6c8651 (origin/stash-3.x-backports) Merge pull request #38 from memory/update-all-jobs-script
| | | | | | | |\  
| | | | | | |/ /  
| | | | | | | * 763d16a (memory/update-all-jobs-script) add a script to manually force an update of all jobs
| | | | | | * |   113366e Merge branch 'feature/fix-refspecs' into stash-3.x-backports
| | | | | | |\ \  
| | | | | | | * | e4fc9ea Remove superfluous fetch
| | | | | | |/ /  
| | | | | |/| |   
| | | | | * | | 50218a7 (memory/verify_pr_refspec) use pull-request refspec in verify_pr job
| | | | | | * |   8604cfa Merge pull request #33 from terabyte/backporting-merge-base
| | | | | | |\ \  
| | | | | |/ / /  
| | | |_|_| / /   
| | |/| | |  /    
| | * | | | | 3dc1533 (origin/backporting-merge-base) Fix issue #31: editing a repo config as non-system-admin when locked fails
| |/ / / / /  
| | | | * |   38a52a6 Merge pull request #23 from memory/verify-pr-refspec
| | | | |\ \  
| | | | |/ /  
| | | |/| |   
| | | * | | fb78c98 (memory/verify-pr-refspec) set default refspec for verify builds to support cross-repo PRs
| | |/ / /  
| | | * |   6b10331 Merge commit 'memory/default-deactivate' into stash-3.x-backports
| | | |\ \  
| | |_|/ /  
| |/| | |   
| * | | | 5f603f3 (memory/default-deactivate) Default build activations to false
|/ / / /  
| | * | 567b77b (memory/fix-build-links) fix generation of links to prefixed/foldered jobs
| |/ /  
| * |   cf0128b Merge pull request #16 from terabyte/feature/bp-issue-12
| |\ \  
|/ / /  
| * | 558845d (origin/feature/bp-issue-12) Making folder prefix @NotNull so it can't cause NPEs later
| * | 6185ed8 Fix build links when folders are in use
|/ /  
| | * c287bcc (origin/archive/original-bitbucket-porting-branch) Fix build links when folders are in use
| | * 04ab116 Update generated-test-resources.zip for bitbucket migration
| | * 16feaf9 fix soy
| | * ece008a Fix stash-resource => client-resource
| | * 7c977c7 (feature/bitbucket-porting) Bitbucket instance runs, but some things remain broken
| | * 1dfe6f0 Updating plugin sdk to 6.1.0
| | * 8ee9f20 Fix tests harder
| | * a1805c5 tests pass, but no way this actually works
| | * afc54be compiles, tests broke as shit
| | * a0645d9 pass2
| | * 441723d pass1
| |/  
|/|   
* | 250fef0 Updating build success icons
* | 9d3c702 (ansi) add support for several helpful plugins
* | e07dde4 bin/ should not be ignored, has scripts we check in
* |   af43591 Merge pull request #10 from terabyte/feature/travis
|\ \  
| * | 7729e1d Adding travis build file
* | |   4655777 Merge pull request #9 from terabyte/feature/folder-support
|\ \ \  
| |/ /  
|/| |   
| * | 89ebe84 Cleanup checkbox logic
| * | c34f39a Added documentation for folder features
| * | 09af434 Rename user projects and place in their own folder when folder support is enabled
| * | ab99ca7 First pass at folder support
| * | ae5133d Another stash 3.11 fix for RepositoryService.getCloneLinks()
* | |   e6c51cf Merge branch 'more-fixes-forstash-3.11'
|\ \ \  
| * | | 118892d Update due to Stash renaming: getVetos -> getVetoes
| * | | 643ab95 Fix simple order of operations logic bug
|/ / /  
| | | * d5504c1 (memory/ansicolor-timeout-timestamp, ansicolor-timeout-timestamp) add support for several helpful plugins
| |_|/  
|/| |   
| | | * b5c031b (origin/archived/old-folders) Added documentation for folder features
| | | * 88502e0 Rename user projects and place in their own folder when folder support is enabled
| | | * ea1003f First pass at folder support
| | |/  
| |/|   
| * | 731a223 Updating dependency on jenkins-client to 3.3 snapshot for folder support
| * | fa21d52 Updating jenkins-client to 0.3.2
|/ /  
| | * 2dc722a (memory/prefix-builds) Allow users to prefix job paths
| |/  
|/|   
* | af75567 Documentation update
|/  
* 268c14c Documenting possible known bug
* 4c31fab Another stash 3.11 fix I missed the first time
*   224ed11 Merge pull request #2 from memory/regexery
|\  
| | * 06552eb (memory/merge-prefix) Add a prefix option that allows jobs to be put in different folders
| | * 27d2497 Revert "Merge pull request #24 from davidk01/psql-retry"
| | * 41fee7d fixing PSQLException error
| | * dc0a5c5 Documenting possible known bug
| | * d7e8c84 Another stash 3.11 fix I missed the first time
| |/  
| * dffe21c (memory/regexery) revert alterations to curls outside of actual java code
| * 4925e1f relax regex, curl requirements
|/  
* 39a0259 Updating for stash 3.11 compat
* 601baef (origin/prod, memory/prod) Updating plugin sdk and tomcat
*   271b7f5 Merge remote-tracking branch 'upstream/master' into feature/ssh-creds-by-user
|\  
| *   123e70c Merge pull request #20 from davidk01/master
| |\  
| | * bae7768 servlet for checking stashbot enable/disable status check status of stashbot before adding Trigger PR link
| | * 71d13a5 vagrantfile for setting up dev environment
| |/  
| *   4dd8563 Merge pull request #18 from davidk01/patch-1
| |\  
| | * 1eb0195 Make 'Trigger PR' conditional
| |/  
* | 9e3fb0c Update generated-test-resources
* | d8b2c88 Adding local version of jenkins-client jar
* | 9f3da81 Automatic SSH Key Authentication
| | * 9b3dfa9 (origin/archived/old-ssh-creds-dev, memory/archived/old-ssh-creds-dev) Adding local version of jenkins-client jar
| | * 7f3e2d7 Fix for new jenkins-client version (crumb flag => false) and other things
| | * 1424590 pom updates
| | * 1de077c working except for pom
| | * 964712b Adds SSH keys to the stash user
| | * aad5c23 Update README with bugs and features
| | | * ebeea93 (origin/archived/stash-sadness-edition, memory/archived/stash-sadness-edition) checkpoint
| | |/  
| | | * 74ebbee (origin/archived/ssh-creds-first-pass, memory/feature/ssh-creds, memory/archived/ssh-creds-first-pass) Internal APIs, oh my!
| | |/  
| | * 5ab7cf6 checkpoint - with snapshot jenkins-client, can create credentials
| | * 7b0dfa6 checkpoint
| | * 701834a Documentation update
| | * 8bf48a9 Updating jenkins client to 0.3.0
| | * 197434e Whitespace fixup
| | * db405b2 First pass: ssh credentials work when manually configured
| |/  
|/|   
* | 0ad061b Updating for compatibility with stash 3.10.0+
|/  
| * a33e237 (origin/archived/break-stuff-fix-stuff, memory/archived/break-stuff-fix-stuff) Fix that thing I broke
| * 3a68e75 This is a broken commit!
| * 2e1466c test commit
|/  
*   32afe9c Merge pull request #103 in ATLASP/stashbot-helper from feature/disable-verify to master
|\  
| * 1cc246e New repositories have JobTypes enabled by default
| * 2ad3fc2 JobTypes can now be enabled/disabled individually
| * 3b19db7 Killing dead code
| * 1af69b5 Refactoring before disable-verify change
|/  
*   1547865 Merge pull request #102 in ATLASP/stashbot-helper from feature/fix-tx to master
|\  
| * 669f6b1 Fix for DB Transaction Issues
|/  
*   037f421 Merge pull request #101 in ATLASP/stashbot-helper from feature/status to master
|\  
| * 659bd2f Include conflicted status in merge blockers
|/  
* 6525cf5 Don't include buildRef unless it is set
*   e63b1ae Merge pull request #99 in ATLASP/stashbot-helper from feature/pr-trigger to master
|\  
| *   f3db3c0 Merge pull request #100 in ATLASP/stashbot-helper from feature/merge-check-status to feature/pr-trigger
| |\  
| | * 156426b Add detection of failure state and more helpful merge check veto messages
| |/  
| * eab489e Add a retrigger link to the pull request page
* | 8d818f1 Removing internal references.
* |   776000c Merge pull request #98 in ATLASP/stashbot-helper from feature/build-status-service-second-pass to master
|\ \  
| |/  
| * 443f367 Second Pass Build Status Service
|/  
*   2c98cba Merge pull request #97 in ATLASP/stashbot-helper from feature/build-status to master
|\  
| * a95a1f3 PR Status Servlet
* |   a24b8f3 Merge pull request #96 in ATLASP/stashbot-helper from feature/retrigger-publish to master
|\ \  
| |/  
| * ada6663 Add support for manual triggering with buildRef
| * fd874d4 Add publish link
| * a1b6d79 Remove unused var, fix warning
|/  
*   8e0675e Merge pull request #95 in ATLASP/stashbot-helper from feature/artifacts to master
|\  
| * e8a120e Implement Artifact Archival
|/  
*   b37d9c4 Merge pull request #94 in ATLASP/stashbot-helper from feature/transaction to master
|\  
| * 0756fde making activeobjects calls transactional
|/  
* 3095a86 Update deploy path
* 2977a2a (tag: 1.3.8) Switching to git-describe Versions
*   20b4277 Merge pull request #92 in ATLASP/stashbot-helper from feature/stash-3.6 to develop
|\  
| * 2648732 Updating to stash 3.6.0
| * 9bd283d Updating for java8
|/  
*   60b338a Merge pull request #91 in ATLASP/stashbot-helper from feature/merge-driver to develop
|\  
| * d4d4a2b Moving prebuild command to occur before merge for greater flexibility
|/  
* a185470 Updating develop poms back to pre merge state
*   5684954 Merge branch 'master' into develop
|\  
| *   e5d9787 (tag: 1.3.7) Merge branch 'release/1.3.7'
| |\  
| | * da888f7 updating poms for branch'release/1.3.7' with non-snapshot versions
| | * b9d7073 updating poms for branch '1.3.7' with snapshot versions
* | | 5b6e34f updating develop poms to master versions to avoid merge conflicts
* | | 3fd9897 updating poms for 1.3.8-SNAPSHOT development
| |/  
|/|   
* |   d7bb917 Merge pull request #89 in ATLASP/stashbot-helper from feature/bigfix to develop
|\ \  
| * | 2e19f9f Simplify trigger logic
| * | aab375a Fix permissions when executing job asynchronously
| * | 62738e9 Improve perf when making large pushes
|/ /  
* | ea1136f Updating docs to include release process
* | e6e494d Updating develop poms back to pre merge state
* |   1a6fbdb Merge branch 'master' into develop
|\ \  
| |/  
| *   75bec2a (tag: 1.3.5) Merge branch 'release/1.3.5'
| |\  
| | * 06c3006 updating poms for branch'release/1.3.5' with non-snapshot versions
| | * af34f9a updating poms for branch '1.3.5' with snapshot versions
| |/  
* | b56d590 updating develop poms to master versions to avoid merge conflicts
* | 65872fc updating poms for 1.3.6-SNAPSHOT development
|/  
* 70fc414 Adding jgitflow-maven-plugin
* a6d00c3 Updating .gitignore
* 165551a Remove Asynchronous Hook Enabling Code
* e0efa1c ITOOLS-13887: Stashbot no longer triggers extra verifies
*   f7dc785 Merge pull request #81 in ATLASP/stashbot-helper from feature/lockdown to master
|\  
| * c6e16c7 ITOOLS-14050: Fix lockdown feature to prevent changing to *or* from locked servers
* | e3da3fb Revert "ITOOLS-13887: Stashbot no longer triggers extra verifies"
* | cef3ca6 Start 1.3.5-dev
* | 62952de (tag: 1.3.4) Release 1.3.4 stashbot
* |   cc18215 Merge pull request #82 in ATLASP/stashbot-helper from feature/kniktas_fixdisabledforms to master
|\ \  
| * | 1d89c0c ITOOLS-9989 Fix faulty enable/disable logic.
|/ /  
* | 12f6bb6 Start 1.3.4-dev. Stupid maven
* | 5690241 (tag: 1.3.3) Stashbot 1.3.3
* |   4f946d2 Merge pull request #78 in ATLASP/stashbot-helper from feature/kniktas_preserveConfig to master
|\ \