diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 11:41:50 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 11:41:50 +0300 |
| commit | 3ad645a2c4d1a5bb85d894bfbe429f6bed39e973 (patch) | |
| tree | 35f8e1a0f98dc5bbf0e79300617ab36465d76713 /spec/features/projects | |
| parent | 4ec1720fdbf6b4fb4ae5dc91bc0f5974717e6caf (diff) | |
| parent | 6027375ca5467436e45b2eca4299ece6d3f9501d (diff) | |
Merge branch '17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option' into 'master'
Skip TeamCity trigger on branch delete and support MR triggers
Closes #13871 and #17690
See merge request gitlab-org/gitlab-ce!29836
Diffstat (limited to 'spec/features/projects')
| -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') |