Download as
Browse Code »

Commit 3bf93c09aba9687b61d83cc3ec91598f71ae621f

Authored by Dmitriy Zaporozhets
2 parents 63b78a39 ab5205da
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'wording-of-notification-setting' of /home/git/repositories/gitlab/gitlabhq

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/views/notifications/show.html.haml
  Diff comments   View file @3bf93c0
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 .row 16 .row
17 .span4 17 .span4
18 - %h5 Global 18 + %h5 Global setting
19 .span7 19 .span7
20 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do 20 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
21 = hidden_field_tag :notification_type, 'global' 21 = hidden_field_tag :notification_type, 'global'
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 = link_to '#', class: 'js-toggle-visibility-link' do 36 = link_to '#', class: 'js-toggle-visibility-link' do
37 %h6.btn.btn-tiny 37 %h6.btn.btn-tiny
38 %i.icon-chevron-down 38 %i.icon-chevron-down
39 - %span Per project notifications settings 39 + %span Per project notifications setting
40 40
41 %ul.well-list.js-toggle-visibility-container.hide 41 %ul.well-list.js-toggle-visibility-container.hide
42 - @users_projects.each do |users_project| 42 - @users_projects.each do |users_project|
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 53
54 = label_tag do 54 = label_tag do
55 = radio_button_tag :notification_level, Notification::N_GLOBAL, notification.global?, id: dom_id(users_project, 'notification_level'), class: 'trigger-submit' 55 = radio_button_tag :notification_level, Notification::N_GLOBAL, notification.global?, id: dom_id(users_project, 'notification_level'), class: 'trigger-submit'
56 - %span Use global settings 56 + %span Use global setting
57 57
58 = label_tag do 58 = label_tag do
59 = radio_button_tag :notification_level, Notification::N_DISABLED, notification.disabled?, id: dom_id(users_project, 'notification_level'), class: 'trigger-submit' 59 = radio_button_tag :notification_level, Notification::N_DISABLED, notification.disabled?, id: dom_id(users_project, 'notification_level'), class: 'trigger-submit'