diff options
| author | Hiroyuki Sato <h-sato@ruby-dev.jp> | 2017-03-04 17:03:14 +0300 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-03-08 12:42:50 +0300 |
| commit | a5521bad4012a9eea21cb067271c8ec1810c6d8c (patch) | |
| tree | 3544226812c93e9abfcaceafd939fc4a168ecd61 /app/views/projects/wikis/edit.html.haml | |
| parent | e78a366925553a1268f8dc6e0d57342053a3240a (diff) | |
Prevent concurrent editing wiki
Diffstat (limited to 'app/views/projects/wikis/edit.html.haml')
| -rw-r--r-- | app/views/projects/wikis/edit.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index 8cf018da1b7..2ec03a00db9 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -2,6 +2,12 @@ - page_title "Edit", @page.title.capitalize, "Wiki" %div{ class: container_class } + - if @conflict + .alert.alert-danger + Someone edited the page the same time you did. Please check out + = link_to "the page", namespace_project_wiki_path(@project.namespace, @project, @page), target: "_blank" + and make sure your changes will not unintentionally remove theirs. + .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') |