summaryrefslogtreecommitdiff
path: root/features/steps/user.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-23 14:58:15 +0000
committerDouwe Maan <douwe@gitlab.com>2015-03-23 14:58:15 +0000
commit3ca34bb8f0fa4fa3a40e9ccc44cd5d8784f30c7d (patch)
tree9c706fee0243e510edec205d0492e8fd221011c3 /features/steps/user.rb
parent005f7eb41f9086cbe65fca9862565d6323e41d14 (diff)
parenta3daead1b00c28a16684cf11970ebd6da27511e2 (diff)
downloadgitlab-ce-3ca34bb8f0fa4fa3a40e9ccc44cd5d8784f30c7d.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: ![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png) After: ![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png) See merge request !427
Diffstat (limited to 'features/steps/user.rb')
0 files changed, 0 insertions, 0 deletions