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 /spec/models/wiki_page_spec.rb | |
| 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 'spec/models/wiki_page_spec.rb')
| -rw-r--r-- | spec/models/wiki_page_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index d76d94c3186..4f462044532 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -61,8 +61,8 @@ describe WikiPage, models: true do actual_order = grouped_entries.map do |page_or_dir| get_slugs(page_or_dir) - end. - flatten + end + .flatten expect(actual_order).to eq(expected_order) end end |