deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis

Browse source 
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-03-15 16:55:07 +02:00
commit 71ab011a17
30 changed files with 1252 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/steps/shared/paths.rb
View file

@ -165,7 +165,7 @@ module SharedPaths
end
Given "I visit my project's wiki page" do
visit project_wiki_path(@project, :index)
visit project_wiki_path(@project, :home)
end
When 'I visit project hooks page' do
@ -260,7 +260,7 @@ module SharedPaths
end
Given 'I visit project wiki page' do
visit project_wiki_path(@project, :index)
visit project_wiki_path(@project, :home)
end
def root_ref