diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-23 14:58:15 +0000 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-24 12:54:24 -0700 |
| commit | 1b23122f999980f6725ad617cde44b582b663fdc (patch) | |
| tree | f167e76471218b541d4a5c8096571977a704c123 /features/admin/settings.feature | |
| parent | cd26d79ca4531a95eb165191ec84ef86914665f4 (diff) | |
| download | gitlab-ce-1b23122f999980f6725ad617cde44b582b663fdc.tar.gz | |
Merge branch 'fix-admin-service-template-config' into 'master'
Include missing events and fix save functionality in admin service template settings form
### What does this MR do?
This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings.
### Are there points in the code the reviewer needs to double check?
No.
### Why was this MR needed?
Because the service template form was broken and untested.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
#1275
Before:
After:
See merge request !427
Diffstat (limited to 'features/admin/settings.feature')
| -rw-r--r-- | features/admin/settings.feature | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/features/admin/settings.feature b/features/admin/settings.feature index 8fdf0575c2c..52e47307b23 100644 --- a/features/admin/settings.feature +++ b/features/admin/settings.feature @@ -7,3 +7,10 @@ Feature: Admin Settings Scenario: Change application settings When I modify settings and save form Then I should see application settings saved + + Scenario: Change Slack Service Template settings + When I click on "Service Templates" + And I click on "Slack" service + Then I check all events and submit form + And I should see service template settings saved + And I should see all checkboxes checked |