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

Merge branch '27210-add-cancel-btn-to-new-page-domain' into 'master'
633f3a24 · Filipa Lacerda · b9ef51ee · 76c926db · 633f3a24 · 633f3a24
Commit 633f3a24 authored Mar 28, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

new.html.haml app/views/projects/pages_domains/new.html.haml +2 -0

27210-add-cancel-btn-to-new-page-domain.yml ...gs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml +5 -0

No files found.
--- 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'
--- a/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
+++ b/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
+---
+title: Adds cancel btn to new pages domain page
+merge_request: 18026
+author: Jacopo Beschi @jacopo-beschi
+type: added