Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis ...

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

2013-03-15 16:55:07 +02:00

..

admin

Remove pending steps (no functional - no tests)

2013-01-24 22:31:48 +02:00

dashboard

Tests for dashboard projects fixed

2013-03-12 15:15:14 +04:00

group

Ability to manage and remove group as owner outside of admin area

2013-02-01 19:04:11 +02:00

profile

Improve user feedback on the Profile > Design page

2012-11-21 15:01:40 -05:00

project

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

2013-03-15 16:55:07 +02:00

steps

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

2013-03-15 16:55:07 +02:00

support

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

2013-03-15 16:55:07 +02:00

teams

Replace projects_box with ui-box. Fixed team spinach test

2013-03-14 13:12:11 +02:00