diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-27 17:29:03 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-27 17:29:03 +0000 |
| commit | 121c5c837fdf9b001fa80f9395cd327af17e5a9f (patch) | |
| tree | 1b558bd29c13e4258e78b729047aad95512a051c | |
| parent | 0fcd72e06f92f0f2bd012e8d755ed02ff1a7eb54 (diff) | |
| parent | c0bb6d4abf5fbc0ab374e93aa51581882e6def20 (diff) | |
| download | gitlab-ce-121c5c837fdf9b001fa80f9395cd327af17e5a9f.tar.gz | |
Merge branch '19075-new-wiki' into 'master'
Remove duplicate new page btn from edit wiki
## What does this MR do?
Removes duplicate button on wiki page
## What are the relevant issue numbers?
Closes #19075
## Screenshots (if relevant)
See merge request !4904
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/wikis/edit.html.haml | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 840ef73f742..d55f609e322 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 8.9.1 - Fix user creation with stronger minimum password requirements !4054 (nathan-pmt) - Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true. !4912 - Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826. !4915 + - Remove duplicate 'New Page' button on edit wiki page v 8.9.0 - Fix builds API response not including commit data diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index bf5d09d50c2..817bf9b3f69 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -15,9 +15,10 @@ Edit Page .nav-controls - - if can?(current_user, :create_wiki, @project) - = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do - New Page + - if !(@page && @page.persisted?) + - if can?(current_user, :create_wiki, @project) + = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do + New Page = render 'main_links' |