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
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-31 06:08:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-31 06:08:13 +0300
commit25805c16335ed6466f0e475417e3005cd09848c2 (patch)
tree59e83dff33c409d33b6cfac4c1bfd8e310eadb78 /app
parent13ddda5208f9175e822af6d05a32600bc9cad091 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/helpers/users_helper.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index a382b5e7b74..601ae4f9264 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -262,9 +262,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