diff options
| author | Nikolay Novikov <nikkes@mail.ru> | 2018-08-02 17:33:26 +0000 |
|---|---|---|
| committer | Fabio Pitino <fpitino@gitlab.com> | 2019-06-21 15:17:47 +0100 |
| commit | 5f1038c8886ceb0e3879f29a074af7d4c6cb6171 (patch) | |
| tree | 00e2b484a69f0e20127c095f3cf82dcea15ff14a /spec/features | |
| parent | 671d7cdc445b3a4fdbd2295996d149e833d6b6c2 (diff) | |
| download | gitlab-ce-5f1038c8886ceb0e3879f29a074af7d4c6cb6171.tar.gz | |
Skip TeamCity on branch delete and add MR trigger
This is a take over from a community contribution:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990
Skip TeamCity push event when related to branch delete
Support merge request events for TeamCity service.
Add checkbox for merge request triggers in the TeamCity
configuration page.
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb index 28d83a8b961..c50fd93e4cb 100644 --- a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb +++ b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb @@ -15,6 +15,8 @@ describe 'User activates JetBrains TeamCity CI' do it 'activates service' do check('Active') + check('Push') + check('Merge request') fill_in('Teamcity url', with: 'http://teamcity.example.com') fill_in('Build type', with: 'GitlabTest_Build') fill_in('Username', with: 'user') |