Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
tdkscms
gitlab-foss
Commits
3f3582e1
Commit
3f3582e1
authored
Aug 01, 2024
by
徐豪
Browse files
wiki跳转+jenkins实际端口csp
parent
4643298e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
32 deletions
+3
-32
app/views/shared/empty_states/_wikis.html.haml
app/views/shared/empty_states/_wikis.html.haml
+2
-31
lib/gitlab/content_security_policy/directives.rb
lib/gitlab/content_security_policy/directives.rb
+1
-1
No files found.
app/views/shared/empty_states/_wikis.html.haml
View file @
3f3582e1
-
messages
=
wiki_empty_state_messages
(
@wiki
)
-
hide_create
=
local_assigns
[
:hide_create
]
-
illustration
=
'illustrations/empty-state/empty-wiki-md.svg'
-
title
=
messages
.
dig
(
:readonly
,
:title
)
-
description
=
messages
.
dig
(
:readonly
,
:body
)
-
primary_button_text
=
nil
-
primary_button_link
=
nil
-
secondary_button_text
=
nil
-
secondary_button_link
=
nil
-
if
!
hide_create
&&
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
-
title
=
messages
.
dig
(
:writable
,
:title
)
-
primary_button_text
=
s_
(
'WikiEmpty|Create your first page'
)
-
primary_button_link
=
wiki_page_path
(
@wiki
,
params
[
:id
],
view:
'create'
)
-
description
=
messages
.
dig
(
:writable
,
:body
)
-
if
show_enable_confluence_integration?
(
@wiki
.
container
)
-
secondary_button_text
=
s_
(
'WikiEmpty|Enable the Confluence Wiki integration'
)
-
secondary_button_link
=
edit_project_settings_integration_path
(
@project
,
:confluence
)
=
render
Pajamas
::
EmptyStateComponent
.
new
(
svg_path:
illustration
,
title:
title
,
primary_button_text:
primary_button_text
,
primary_button_link:
primary_button_link
,
secondary_button_text:
secondary_button_text
,
secondary_button_link:
secondary_button_link
,
empty_state_options:
{
data:
{
testid:
'wiki-empty-state'
}
})
do
|
c
|
-
c
.
with_description
do
=
description
%div
.text-center
{
style:
'display: flex; justify-content: center; align-items: center; height: 70vh;'
}
=
link_button_to
"Go to Custom Wiki"
,
"http://10.21.0.42:17000"
,
variant: :primary
,
style:
'background-color: #1F75CB; color: white; height: 50px; width: 180px;'
,
target:
"_blank"
\ No newline at end of file
lib/gitlab/content_security_policy/directives.rb
View file @
3f3582e1
...
...
@@ -12,7 +12,7 @@ def self.connect_src
end
def
self
.
frame_src
"https://www.google.com/recaptcha/ https://www.recaptcha.net/ http://10.21.0.42:7000 http://10.21.0.42:8000 http://10.21.0.42:9000"
"https://www.google.com/recaptcha/ https://www.recaptcha.net/ http://10.21.0.42:7000 http://10.21.0.42:8000
http://10.21.0.42:18000
http://10.21.0.42:9000"
end
def
self
.
script_src
...
...
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