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
75ff95ed
Commit
75ff95ed
authored
Sep 11, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
8fe7127f
6d7deac3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/clusters/clusters/user/_form.html.haml
app/views/clusters/clusters/user/_form.html.haml
+1
-1
app/views/clusters/clusters/user/_header.html.haml
app/views/clusters/clusters/user/_header.html.haml
+1
-1
No files found.
app/views/clusters/clusters/user/_form.html.haml
View file @
75ff95ed
-
more_info_link
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'add
ing-an
-existing-kubernetes-cluster'
),
target:
'_blank'
anchor:
'add-existing-kubernetes-cluster'
),
target:
'_blank'
-
rbac_help_link
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'role-based-access-control-rbac-core-only'
),
target:
'_blank'
...
...
app/views/clusters/clusters/user/_header.html.haml
View file @
75ff95ed
%h4
=
s_
(
'ClusterIntegration|Enter the details for your Kubernetes cluster'
)
%p
-
link_to_help_page
=
link_to
(
s_
(
'ClusterIntegration|documentation'
),
help_page_path
(
'user/project/clusters/index'
,
anchor:
'add
ing-an
-existing-kubernetes-cluster'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
-
link_to_help_page
=
link_to
(
s_
(
'ClusterIntegration|documentation'
),
help_page_path
(
'user/project/clusters/index'
,
anchor:
'add-existing-kubernetes-cluster'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Please enter access information for your Kubernetes cluster. If you need help, you can read our %{link_to_help_page} on Kubernetes'
).
html_safe
%
{
link_to_help_page:
link_to_help_page
}
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