Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: jenkins-gitlab support push merge request event #1064

Merged
merged 1 commit into from
Sep 5, 2022
Merged

feat: jenkins-gitlab support push merge request event #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/util/scm/gitlab/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,10 @@ func (c *Client) AddWebhook(webhookConfig *git.WebhookConfig) error {
return nil
}
p := &gitlab.AddProjectHookOptions{
PushEvents: gitlab.Bool(true),
Token: gitlab.String(webhookConfig.SecretToken),
URL: gitlab.String(webhookConfig.Address),
PushEvents: gitlab.Bool(true),
Token: gitlab.String(webhookConfig.SecretToken),
URL: gitlab.String(webhookConfig.Address),
MergeRequestsEvents: gitlab.Bool(true),
}
_, _, err = c.Projects.AddProjectHook(c.GetRepoPath(), p)
if err != nil {
Expand Down
24 changes: 24 additions & 0 deletions staging/dtm-repo-scaffolding-java-springboot/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*
9 changes: 9 additions & 0 deletions staging/dtm-repo-scaffolding-java-springboot/README.md.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# [[.AppName]]

This is a repo for app [[.AppName]]; bootstrapped by DevStream.

By default, the automatically generated scaffolding contains:

- a piece of sample java web app code using the [SpringBoot](https://spring.io/projects/spring-boot/)
- Dockerfile
- .gitignore