diff options
| author | Maxim Epishchev <epishev@garant.ru> | 2016-02-01 12:15:56 +0300 |
|---|---|---|
| committer | Maxim Epishchev <epishev@garant.ru> | 2016-02-01 12:15:56 +0300 |
| commit | b2e2b808c9155e78a9c6244d89b57ee9a0f32c90 (patch) | |
| tree | 4786a0d6b4a177dc2653d909cfd5952c2e5fe0a3 /src/main/resources | |
| parent | 96ab7a75f14d9990f3c8f1255f9790c496a64473 (diff) | |
| parent | f0588fb15ee687619695bccfc7553dbcd43b948d (diff) | |
| download | bbprb-b2e2b808c9155e78a9c6244d89b57ee9a0f32c90.tar.gz | |
Merge branch 'CredentialsSupport' of https://github.com/kadaan/bitbucket-pullrequest-builder-plugin into CredentialsSupport
Conflicts:
.gitignore
src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly index 25acac0..d4b23da 100644 --- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly +++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly @@ -1,7 +1,10 @@ -<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> +<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials"> <f:entry title="Cron" field="cron"> <f:textbox /> </f:entry> + <f:entry title="${%Credentials}" field="credentialsId"> + <c:select/> + </f:entry> <f:entry title="Bitbucket BasicAuth Username" field="username"> <f:textbox /> </f:entry> |