diff --git a/app/views/shared/empty_states/_wikis.html.haml b/app/views/shared/empty_states/_wikis.html.haml index e3d2a419eb5c538a7eb660370bd807e28a09f075..cab6bcc16360b96f4e6dd25f90d0904596122046 100644 --- a/app/views/shared/empty_states/_wikis.html.haml +++ b/app/views/shared/empty_states/_wikis.html.haml @@ -1,31 +1,2 @@ -- 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 diff --git a/lib/gitlab/content_security_policy/directives.rb b/lib/gitlab/content_security_policy/directives.rb index 8165acbbe6f1b901c5c7cc6585b9771b184d448c..cab0245b643b133705a8c9d490856a655a75e7b1 100644 --- a/lib/gitlab/content_security_policy/directives.rb +++ b/lib/gitlab/content_security_policy/directives.rb @@ -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