app/views/projects/wikis · 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
..
_form.html.haml		Loading commit data...
_main_links.html.haml		Loading commit data...
_new.html.haml		Loading commit data...
_pages_wiki_page.html.haml		Loading commit data...
_sidebar.html.haml		Loading commit data...
_sidebar_wiki_page.html.haml		Loading commit data...
_wiki_directory.html.haml		Loading commit data...
_wiki_page.html.haml		Loading commit data...
edit.html.haml		Loading commit data...
empty.html.haml		Loading commit data...
git_access.html.haml		Loading commit data...
history.html.haml		Loading commit data...
pages.html.haml		Loading commit data...
show.html.haml		Loading commit data...