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
f2b9da4a
Commit
f2b9da4a
authored
May 28, 2021
by
Amy Qualls
Committed by
Kushal Pandya
May 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Gitpod UI settings for tone and style
parent
6187c958
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
app/helpers/gitpod_helper.rb
app/helpers/gitpod_helper.rb
+1
-1
app/views/admin/application_settings/_gitpod.html.haml
app/views/admin/application_settings/_gitpod.html.haml
+4
-2
locale/gitlab.pot
locale/gitlab.pot
+10
-7
No files found.
app/helpers/gitpod_helper.rb
View file @
f2b9da4a
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
module
GitpodHelper
module
GitpodHelper
def
gitpod_enable_description
def
gitpod_enable_description
s_
(
'
Enable %{linkStart}Gitpod%{linkEnd} integration to launch a development environment in your browser directly from GitLab
.'
)
s_
(
'
Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled
.'
)
end
end
end
end
app/views/admin/application_settings/_gitpod.html.haml
View file @
f2b9da4a
...
@@ -22,7 +22,9 @@
...
@@ -22,7 +22,9 @@
=
f
.
label
:gitpod_enabled
,
s_
(
'Gitpod|Enable Gitpod integration'
),
class:
'form-check-label'
=
f
.
label
:gitpod_enabled
,
s_
(
'Gitpod|Enable Gitpod integration'
),
class:
'form-check-label'
.form-group
.form-group
=
f
.
label
:gitpod_url
,
s_
(
'Gitpod|Gitpod URL'
),
class:
'label-bold'
=
f
.
label
:gitpod_url
,
s_
(
'Gitpod|Gitpod URL'
),
class:
'label-bold'
=
f
.
text_field
:gitpod_url
,
class:
'form-control gl-form-input'
,
placeholder:
s_
(
'Gitpod|
e.g.
https://gitpod.example.com'
)
=
f
.
text_field
:gitpod_url
,
class:
'form-control gl-form-input'
,
placeholder:
s_
(
'Gitpod|https://gitpod.example.com'
)
.form-text.text-muted
.form-text.text-muted
=
s_
(
'Gitpod|Add the URL to your Gitpod instance configured to read your GitLab projects.'
)
=
s_
(
'Gitpod|The URL to your Gitpod instance configured to read your GitLab projects, such as https://gitpod.example.com.'
)
-
link_start
=
'<a href="%{url}">'
.
html_safe
%
{
url:
help_page_path
(
'integration/gitpod'
,
anchor:
'enable-gitpod-in-your-user-settings'
)
}
=
s_
(
'Gitpod|To use the integration, each user must also enable Gitpod on their GitLab account. %{link_start}How do I enable it?%{link_end} '
).
html_safe
%
{
link_start:
link_start
,
link_end:
'</a>'
.
html_safe
}
=
f
.
submit
s_
(
'Save changes'
),
class:
'gl-button btn btn-confirm'
=
f
.
submit
s_
(
'Save changes'
),
class:
'gl-button btn btn-confirm'
locale/gitlab.pot
View file @
f2b9da4a
...
@@ -12109,9 +12109,6 @@ msgstr ""
...
@@ -12109,9 +12109,6 @@ msgstr ""
msgid "Enable"
msgid "Enable"
msgstr ""
msgstr ""
msgid "Enable %{linkStart}Gitpod%{linkEnd} integration to launch a development environment in your browser directly from GitLab."
msgstr ""
msgid "Enable Auto DevOps"
msgid "Enable Auto DevOps"
msgstr ""
msgstr ""
...
@@ -15335,16 +15332,19 @@ msgstr ""
...
@@ -15335,16 +15332,19 @@ msgstr ""
msgid "Gitpod"
msgid "Gitpod"
msgstr ""
msgstr ""
msgid "Gitpod|Add the URL to your Gitpod instance configured to read your GitLab projects."
msgstr ""
msgid "Gitpod|Enable Gitpod integration"
msgid "Gitpod|Enable Gitpod integration"
msgstr ""
msgstr ""
msgid "Gitpod|Gitpod URL"
msgid "Gitpod|Gitpod URL"
msgstr ""
msgstr ""
msgid "Gitpod|e.g. https://gitpod.example.com"
msgid "Gitpod|The URL to your Gitpod instance configured to read your GitLab projects, such as https://gitpod.example.com."
msgstr ""
msgid "Gitpod|To use the integration, each user must also enable Gitpod on their GitLab account. %{link_start}How do I enable it?%{link_end} "
msgstr ""
msgid "Gitpod|https://gitpod.example.com"
msgstr ""
msgstr ""
msgid "Given access %{time_ago}"
msgid "Given access %{time_ago}"
...
@@ -35782,6 +35782,9 @@ msgstr ""
...
@@ -35782,6 +35782,9 @@ msgstr ""
msgid "Users"
msgid "Users"
msgstr ""
msgstr ""
msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled."
msgstr ""
msgid "Users in License"
msgid "Users in License"
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