diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-16 20:55:05 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-16 20:55:05 +0000 |
| commit | bcc04515abcc6ad43675ca06b175050c4a5a4b7f (patch) | |
| tree | 21970b4f1bbc553bff4546e4a466bed27832a2ae | |
| parent | f46ae65b980ead4c641fe7e90edc19e0ecdcdc0a (diff) | |
| parent | 1c74f5595f254e2eaeaa9c9fe237832726d56632 (diff) | |
| download | gitlab-ce-bcc04515abcc6ad43675ca06b175050c4a5a4b7f.tar.gz | |
Merge branch 'profile-notifications-dropdown-fix' into 'master'
Fixed profile notifications not being editable
Closes #44198
See merge request gitlab-org/gitlab-ce!17808
| -rw-r--r-- | app/assets/javascripts/pages/profiles/notifications/show/index.js | 7 | ||||
| -rw-r--r-- | spec/features/profiles/user_visits_notifications_tab_spec.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/profiles/notifications/show/index.js b/app/assets/javascripts/pages/profiles/notifications/show/index.js new file mode 100644 index 00000000000..2e24a10fa5c --- /dev/null +++ b/app/assets/javascripts/pages/profiles/notifications/show/index.js @@ -0,0 +1,7 @@ +import NotificationsForm from '../../../../notifications_form'; +import notificationsDropdown from '../../../../notifications_dropdown'; + +document.addEventListener('DOMContentLoaded', () => { + new NotificationsForm(); // eslint-disable-line no-new + notificationsDropdown(); +}); diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb index 1952fdae798..95953fbcfac 100644 --- a/spec/features/profiles/user_visits_notifications_tab_spec.rb +++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb @@ -16,6 +16,6 @@ feature 'User visits the notifications tab', :js do first('#notifications-button').click click_link('On mention') - expect(page).to have_content('On mention') + expect(page).to have_selector('#notifications-button', text: 'On mention') end end |