summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-27 19:29:25 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-27 19:29:25 +0000
commit64131f04e192d64a560177d562f5e32f6a5694ab (patch)
tree878b472639334aaef236fa0b7458907b93f46b81 /features
parentfba50b4afe4e81b7f11103ec131341fea670753b (diff)
parent35259a4f48e19a19437be10c02eb8398c108d507 (diff)
downloadgitlab-ce-64131f04e192d64a560177d562f5e32f6a5694ab.tar.gz
Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'
Prevent concurrent editing wiki Closes #1827 See merge request !9707
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/wiki.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
index 9d38939378d..6a478c50e5e 100644
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
@@ -63,7 +63,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end
step 'That page has two revisions' do
- @page.update("new content", :markdown, "second commit")
+ @page.update("new content", message: "second commit")
end
step 'I click the History button' do