app/controllers/admin/application_settings_controller.rb · 351a563c55f665a93678bf2f22d0aa537bc1cda9 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Fix conflicts in application_settings_controller.rb and spec/features/admin/admin_settings_spec.rb · 351a563c
Dmitriy Zaporozhets authored Apr 16, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
351a563c