Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3bfd133d
Commit
3bfd133d
authored
Nov 03, 2020
by
Mike Jang
Committed by
Miguel Rincon
Nov 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct grammar error in "Sign-in restrictions" text labels
parent
8ddee1f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/views/admin/application_settings/_signin.html.haml
app/views/admin/application_settings/_signin.html.haml
+2
-2
changelogs/unreleased/273623-replace-sign-in-text-with-sign-in-text.yml
...eleased/273623-replace-sign-in-text-with-sign-in-text.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/views/admin/application_settings/_signin.html.haml
View file @
3bfd133d
...
@@ -50,11 +50,11 @@
...
@@ -50,11 +50,11 @@
=
f
.
text_field
:home_page_url
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
,
:'aria-describedby'
=>
'home_help_block'
=
f
.
text_field
:home_page_url
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
,
:'aria-describedby'
=>
'home_help_block'
%span
.form-text.text-muted
#home_help_block
We will redirect non-logged in users to this page
%span
.form-text.text-muted
#home_help_block
We will redirect non-logged in users to this page
.form-group
.form-group
=
f
.
label
:after_sign_out_path
,
class:
'label-bold'
=
f
.
label
:after_sign_out_path
,
_
(
'After sign-out path'
),
class:
'label-bold'
=
f
.
text_field
:after_sign_out_path
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
,
:'aria-describedby'
=>
'after_sign_out_path_help_block'
=
f
.
text_field
:after_sign_out_path
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
,
:'aria-describedby'
=>
'after_sign_out_path_help_block'
%span
.form-text.text-muted
#after_sign_out_path_help_block
We will redirect users to this page after they sign out
%span
.form-text.text-muted
#after_sign_out_path_help_block
We will redirect users to this page after they sign out
.form-group
.form-group
=
f
.
label
:sign_in_text
,
class:
'label-bold'
=
f
.
label
:sign_in_text
,
_
(
'Sign-in text'
),
class:
'label-bold'
=
f
.
text_area
:sign_in_text
,
class:
'form-control'
,
rows:
4
=
f
.
text_area
:sign_in_text
,
class:
'form-control'
,
rows:
4
.form-text.text-muted
Markdown enabled
.form-text.text-muted
Markdown enabled
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-success"
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-success"
changelogs/unreleased/273623-replace-sign-in-text-with-sign-in-text.yml
0 → 100644
View file @
3bfd133d
---
title
:
Corrected grammar in Sign-in restrictions text
merge_request
:
46500
author
:
type
:
other
locale/gitlab.pot
View file @
3bfd133d
...
@@ -2294,6 +2294,9 @@ msgstr ""
...
@@ -2294,6 +2294,9 @@ msgstr ""
msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
msgstr ""
msgstr ""
msgid "After sign-out path"
msgstr ""
msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
msgstr ""
msgstr ""
...
@@ -24693,6 +24696,9 @@ msgstr ""
...
@@ -24693,6 +24696,9 @@ msgstr ""
msgid "Sign-in restrictions"
msgid "Sign-in restrictions"
msgstr ""
msgstr ""
msgid "Sign-in text"
msgstr ""
msgid "Sign-up restrictions"
msgid "Sign-up restrictions"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment