Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/users_helper.rb')
-rw-r--r--app/helpers/users_helper.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index a382b5e7b74..62b9eb2b506 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -120,10 +120,6 @@ module UsersHelper
!user.confirmed?
end
- def ban_feature_available?
- Feature.enabled?(:ban_user_feature_flag)
- end
-
def confirm_user_data(user)
message = if user.unconfirmed_email.present?
_('This user has an unconfirmed email address (%{email}). You may force a confirmation.') % { email: user.unconfirmed_email }
@@ -262,9 +258,11 @@ module UsersHelper
if with_schema_markup
job_title = '<span itemprop="jobTitle">'.html_safe + job_title + "</span>".html_safe
organization = '<span itemprop="worksFor">'.html_safe + organization + "</span>".html_safe
- end
- html_escape(s_('Profile|%{job_title} at %{organization}')) % { job_title: job_title, organization: organization }
+ html_escape(s_('Profile|%{job_title} at %{organization}')) % { job_title: job_title, organization: organization }
+ else
+ s_('Profile|%{job_title} at %{organization}') % { job_title: job_title, organization: organization }
+ end
end
def user_table_headers
@@ -302,6 +300,10 @@ module UsersHelper
other: s_('User|Other')
}.with_indifferent_access.freeze
end
+
+ def saved_replies_enabled?
+ Feature.enabled?(:saved_replies, current_user)
+ end
end
UsersHelper.prepend_mod_with('UsersHelper')