diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
| commit | 2674b548601b279ada46d4b218a9def6fd5b9f6d (patch) | |
| tree | ca1f09225e4d5b80c800af521735bf34f04e16d0 /app/controllers/notification_settings_controller.rb | |
| parent | 8447c6b180297840d835a609d95808834f498d87 (diff) | |
| parent | 6f6c6f68ea7cb976b6c1598e705ba8b2bdaf05a1 (diff) | |
| download | gitlab-ce-2674b548601b279ada46d4b218a9def6fd5b9f6d.tar.gz | |
merge master into issue_3359_3
Diffstat (limited to 'app/controllers/notification_settings_controller.rb')
| -rw-r--r-- | app/controllers/notification_settings_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/notification_settings_controller.rb b/app/controllers/notification_settings_controller.rb index 735e562a497..aacbefd4ab8 100644 --- a/app/controllers/notification_settings_controller.rb +++ b/app/controllers/notification_settings_controller.rb @@ -39,7 +39,7 @@ class NotificationSettingsController < ApplicationController def render_response render json: { - html: view_to_html_string("notifications/buttons/_notifications", notification_setting: @notification_setting), + html: view_to_html_string("shared/notifications/_button", notification_setting: @notification_setting), saved: @saved } end |