Merge branch 'ce-to-ee-2018-10-18' into 'master'

CE upstream - 2018-10-18 13:21 UTC

See merge request gitlab-org/gitlab-ee!7995

app/views/projects/_wiki.html.haml

@@ -5,14 +5,14 @@
         = render_wiki_content(@wiki_home, legacy_render_context(params))
 - else
   - can_create_wiki = can?(current_user, :create_wiki, @project)
-  .project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] }
-    .text-center{ class: container_class }
+  .landing{ class: [('row-content-block row p-0 align-items-center' if can_create_wiki), ('content-block' unless can_create_wiki)] }
+    .col-12.col-md-3.p-0
+      .svg-content
+        = image_tag 'illustrations/wiki_login_empty.svg'
+    .col-12.col-md-9.text-center.text-md-left.pl-md-0.pl-sm-3.mb-4
       %h4
-        This project does not have a wiki homepage yet
+        = _("This project does not have a wiki homepage yet")
       - if can_create_wiki
         %p
-          Add a homepage to your wiki that contains information about your project
-        %p
-          We recommend you
-          = link_to "add a homepage", project_wiki_path(@project, :home)
-          to your project's wiki and GitLab will show it here instead of this message.
+          = _("Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message.")
+        = link_to _("Create your first page"), project_wiki_path(@project, :home) + '?view=create', class: "btn btn-primary"

changelogs/unreleased/48731-show-empty-state-on-wiki-only-projects.yml

+---
+title: Update the empty state on wiki-only projects to display an empty state that
+  is more consistent with the rest of the system.
+merge_request: 22262
+author:
+type: changed

locale/gitlab.pot

@@ -385,6 +385,9 @@ msgstr ""
 msgid "Add Readme"
 msgstr ""
 
+msgid "Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message."
+msgstr ""
+
 msgid "Add a table"
 msgstr ""
 
@@ -2395,6 +2398,9 @@ msgstr ""
 msgid "Create project label"
 msgstr ""
 
+msgid "Create your first page"
+msgstr ""
+
 msgid "CreateTag|Tag"
 msgstr ""
 
@@ -7901,6 +7907,9 @@ msgstr ""
 msgid "This project does not belong to a group and can therefore not make use of group Runners."
 msgstr ""
 
+msgid "This project does not have a wiki homepage yet"
+msgstr ""
+
 msgid "This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target=\"_blank\" rel=\"noopener noreferrer\">enable billing <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a> and try again."
 msgstr ""