diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
| commit | 9b25bbc45d4e6602452e230506601ff0ed8ba84a (patch) | |
| tree | 95f7326e4162a325a5e7c7304c33f18194b52cbe /changelogs/unreleased/20732_member_exists_409.yml | |
| parent | 839018d2d4e3e899b1fa06a43d093a0fdceced42 (diff) | |
| parent | b92d5135d8522e1370636799d74b51f9a37d0b2f (diff) | |
| download | gitlab-ce-9b25bbc45d4e6602452e230506601ff0ed8ba84a.tar.gz | |
Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
Conflicts:
app/controllers/projects/wikis_controller.rb
app/views/projects/wikis/edit.html.haml
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
Diffstat (limited to 'changelogs/unreleased/20732_member_exists_409.yml')
| -rw-r--r-- | changelogs/unreleased/20732_member_exists_409.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/changelogs/unreleased/20732_member_exists_409.yml b/changelogs/unreleased/20732_member_exists_409.yml deleted file mode 100644 index 135647c7ac3..00000000000 --- a/changelogs/unreleased/20732_member_exists_409.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Add member: Always return 409 when a member exists' -merge_request: -author: |