diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-28 09:09:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-28 09:09:23 +0000 |
| commit | 633f3a2495fcd469631d95abbb97bdb636e0cd63 (patch) | |
| tree | 4b938aa1646ce353573f5f317eeef2c1679323c0 | |
| parent | b9ef51ee3f54f7028c3b314a54c953e9ca855dbc (diff) | |
| parent | 76c926db9b5165f413d32e397cd423a8e87fcab5 (diff) | |
| download | gitlab-ce-633f3a2495fcd469631d95abbb97bdb636e0cd63.tar.gz | |
Merge branch '27210-add-cancel-btn-to-new-page-domain' into 'master'
Resolve "Missing cancel button when creating new domain for pages"
Closes #27210
See merge request gitlab-org/gitlab-ce!18026
| -rw-r--r-- | app/views/projects/pages_domains/new.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/pages_domains/new.html.haml b/app/views/projects/pages_domains/new.html.haml index 5a397c9d3c7..e49163880c7 100644 --- a/app/views/projects/pages_domains/new.html.haml +++ b/app/views/projects/pages_domains/new.html.haml @@ -8,3 +8,5 @@ = render 'form', { f: f } .form-actions = f.submit 'Create New Domain', class: "btn btn-save" + .pull-right + = link_to _('Cancel'), project_pages_path(@project), class: 'btn btn-cancel' diff --git a/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml b/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml new file mode 100644 index 00000000000..d96f7e54c8d --- /dev/null +++ b/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml @@ -0,0 +1,5 @@ +--- +title: Adds cancel btn to new pages domain page +merge_request: 18026 +author: Jacopo Beschi @jacopo-beschi +type: added |