spec/features/projects/wiki · 9b25bbc45d4e6602452e230506601ff0ed8ba84a · Forest Godfrey / gitlab-ce

Merge branch 'master' into 1827-prevent-concurrent-editing-wiki · 9b25bbc4

authored Jul 23, 2017

 Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb

9b25bbc4

Name	Last commit	Last update
..
markdown_preview_spec.rb		Loading commit data...
shortcuts_spec.rb		Loading commit data...
user_creates_wiki_page_spec.rb		Loading commit data...
user_git_access_wiki_page_spec.rb		Loading commit data...
user_updates_wiki_page_spec.rb		Loading commit data...
user_views_project_wiki_page_spec.rb		Loading commit data...
user_views_wiki_in_project_page_spec.rb		Loading commit data...