diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2017-09-06 11:05:50 +0200 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-09-06 12:07:21 -0700 |
commit | f1edd8ac80318de77c3ed826f05c0c212b0d94f1 (patch) | |
tree | 7b8dc21dffd782c5861e02f34206a511744d5089 /app | |
parent | b8e389e8640385fc4bb71646f53501f124cd5e72 (diff) | |
download | gitlab-ce-f1edd8ac80318de77c3ed826f05c0c212b0d94f1.tar.gz |
Add missing .html_safes
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/groups_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 970cff835ec..58daf5c97e6 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -129,14 +129,14 @@ module GroupsHelper end def ancestor_locked_but_you_can_override(group) - s_("GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_lock}.") % { ancestor_group: ancestor_group(group), remove_ancestor_share_lock: remove_the_share_lock_from_ancestor(group) } + s_("GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_lock}.").html_safe % { ancestor_group: ancestor_group(group), remove_ancestor_share_lock: remove_the_share_lock_from_ancestor(group) } end def ancestor_locked_so_ask_the_owner(group) - s_("GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_lock}.") % { ancestor_group: ancestor_group(group), remove_ancestor_share_lock: remove_the_share_lock_from_ancestor(group) } + s_("GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_lock}.").html_safe % { ancestor_group: ancestor_group(group), remove_ancestor_share_lock: remove_the_share_lock_from_ancestor(group) } end def ancestor_locked_and_has_been_overridden(group) - s_("GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup.") % { ancestor_group: ancestor_group(group) } + s_("GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup.").html_safe % { ancestor_group: ancestor_group(group) } end end |