summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Karpiak <philip@eswat.ca>2016-11-09 23:58:25 -0500
committerPhilip Karpiak <philip@eswat.ca>2016-11-09 23:58:25 -0500
commit160d22f7deba3855dc055eadce79fa05f1664f67 (patch)
treeb61a2aacf2ca84c873ad74eff54ccd8a54e4f13c
parent0c99e5d0b6b457ef7db2c36f1394fad5c63d1142 (diff)
downloadgitlab-ce-160d22f7deba3855dc055eadce79fa05f1664f67.tar.gz
Use 'Forking in progress' title when appropriate
-rw-r--r--app/views/projects/imports/show.html.haml2
-rw-r--r--changelogs/unreleased/forking-in-progress-title.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml
index 4d8ee562e6a..c52b3860636 100644
--- a/app/views/projects/imports/show.html.haml
+++ b/app/views/projects/imports/show.html.haml
@@ -1,4 +1,4 @@
-- page_title "Import in progress"
+- page_title @project.forked? ? "Forking in progress" : "Import in progress"
.save-project-loader
.center
%h2
diff --git a/changelogs/unreleased/forking-in-progress-title.yml b/changelogs/unreleased/forking-in-progress-title.yml
new file mode 100644
index 00000000000..4b9684844b3
--- /dev/null
+++ b/changelogs/unreleased/forking-in-progress-title.yml
@@ -0,0 +1,4 @@
+---
+title: Use 'Forking in progress' title when appropriate
+merge_request: 7394
+author: Philip Karpiak