diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-29 17:16:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-29 17:16:21 +0000 |
| commit | 5d5e74676741a45fe49bb99ec09aec608fb05db3 (patch) | |
| tree | 0b8f7f3ee87ea2990cb18e97a00b984522577f38 /lib/api/files.rb | |
| parent | 8d3eaf5fa12b4ce8af5f9c335c31844bd079276b (diff) | |
| parent | 808b05e9747d46821ff1cc6a0071e881c2dc0056 (diff) | |
| download | gitlab-ce-5d5e74676741a45fe49bb99ec09aec608fb05db3.tar.gz | |
Merge branch 'refactor-service-settings' into 'master'
Move service template and project service settings into a shared view
This MR reconciles the small differences in the error message layout between the template and project settings, and moves the partial into a shared view. This came from a mention in https://github.com/gitlabhq/gitlabhq/issues/9181 to take care of this.
See merge request !588
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions