diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-14 05:17:17 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-14 05:17:17 +0300 |
| commit | d7c591915893c8c572e9135db4ec27dc174823fd (patch) | |
| tree | bfa34a136c2d30b00ba0bffc9654da7794ed858f /app/views | |
| parent | 7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff) | |
Revert "Optimistic locking for Issue and Merge Requests"
This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 98bbb12eaec..c30bdb0ae91 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -1,12 +1,5 @@ = form_errors(issuable) -- if @conflict - .alert.alert-danger - Someone edited the #{issuable.class.model_name.human.downcase} the same time you did. - Please check out - = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), target: "_blank" - and make sure your changes will not unintentionally remove theirs - .form-group = f.label :title, class: 'control-label' .col-sm-10 @@ -156,5 +149,3 @@ = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" }, method: :delete, class: 'btn btn-danger btn-grouped' = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel' - -= f.hidden_field :lock_version |