diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-10 12:38:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-10 12:38:44 +0000 |
| commit | 5b695dbbda58323d3ea751bf4194f80e686ad067 (patch) | |
| tree | 83cb089e119bbaffebaede3f5d7a6bb04858d198 | |
| parent | c5169b5d447ab6c73bbe542c071a4054c5969165 (diff) | |
| parent | 160d22f7deba3855dc055eadce79fa05f1664f67 (diff) | |
| download | gitlab-ce-5b695dbbda58323d3ea751bf4194f80e686ad067.tar.gz | |
Merge branch 'forking-in-progress-title' into 'master'
Use 'Forking in progress' title when appropriate
See merge request !7394
| -rw-r--r-- | app/views/projects/imports/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/forking-in-progress-title.yml | 4 |
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 |