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/views/profiles/show.html.haml')
-rw-r--r--app/views/profiles/show.html.haml11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 405364b6792..79b2726ed2d 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -103,7 +103,7 @@
%small.form-text.text-gl-muted
= s_("Profiles|Your LinkedIn profile name from linkedin.com/in/profilename")
.form-group.gl-form-group
- = f.label :twitter
+ = f.label :twitter, _('X (formerly Twitter)')
= f.text_field :twitter, class: 'gl-form-input form-control gl-md-form-input-lg', placeholder: s_("Profiles|@username")
.form-group.gl-form-group
- external_accounts_help_url = help_page_path('user/profile/index', anchor: 'add-external-accounts-to-your-user-profile-page')
@@ -122,13 +122,12 @@
allow_empty: true}
%small.form-text.text-gl-muted
= external_accounts_docs_link
- - if Feature.enabled?(:mastodon_social_ui, @user)
- .form-group.gl-form-group
- = f.label :mastodon
- = f.text_field :mastodon, class: 'gl-form-input form-control gl-md-form-input-lg', placeholder: "@robin@example.com"
+ .form-group.gl-form-group
+ = f.label :mastodon
+ = f.text_field :mastodon, class: 'gl-form-input form-control gl-md-form-input-lg', placeholder: "@robin@example.com"
.form-group.gl-form-group
- = f.label :website_url, s_('Profiles|Website url')
+ = f.label :website_url, s_('Profiles|Website URL')
= f.text_field :website_url, class: 'gl-form-input form-control gl-md-form-input-lg', placeholder: s_("Profiles|https://website.com")
.form-group.gl-form-group
= f.label :location, s_('Profiles|Location')