Skip to content

Commit

Permalink
Merge pull request #9491 from krauselukas/admin_notification_config_text
Browse files Browse the repository at this point in the history
Adjust description in notification configuration pages
  • Loading branch information
hennevogel committed May 4, 2020
2 parents c411065 + c9df466 commit 9a58f24
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/api/app/views/webui/subscriptions/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
%h3.card-title
Events
.card-text#notifications
%p Choose default notification settings for events (checked means direct email).
%p Configure global default for notification settings and corresponding channels for selected events.
= render partial: 'subscriptions_form', locals: { path: notifications_path, subscriptions_form: @subscriptions_form }

- content_for :ready_function do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
%i.fas.fa-spinner.invisible
.card-body
%h4.card-title Events
%p Choose from which events you want to get an email
%p Choose events you want to get notified about and the corresponding channels.
#subscriptions-form
= render partial: 'webui/subscriptions/subscriptions_form', locals: { path: update_my_subscriptions_path,
subscriptions_form: @subscriptions_form }
Expand Down
2 changes: 1 addition & 1 deletion src/api/spec/features/webui/notifications_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

context 'update as unprivileged user' do
it_behaves_like 'updatable' do
let(:title) { 'Choose from which events you want to get an email' }
let(:title) { 'Choose events you want to get notified about and the corresponding channels.' }
let(:user) { create(:confirmed_user, login: 'eisendieter') }
let(:path) { my_subscriptions_path }
end
Expand Down

0 comments on commit 9a58f24

Please sign in to comment.