gitlabhq/app
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
..
assets Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 2013-03-15 16:55:07 +02:00
contexts created-by-me filter for issues inside project. Fixed global project.issues order 2013-02-28 17:46:28 +02:00
controllers Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 2013-03-15 16:55:07 +02:00
decorators Use name+username in team -> new 2013-03-13 19:24:30 +02:00
helpers Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 2013-03-15 16:55:07 +02:00
mailers Add a delay for sending emails 2013-02-01 17:04:41 +02:00
models Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 2013-03-15 16:55:07 +02:00
observers Replace current Wiki system with Gollum Wikis. 2013-03-09 16:39:51 -08:00
services cleanup ProjectMover 2013-03-12 14:13:25 +02:00
uploaders skip protection to aws3 2013-02-15 09:49:35 +02:00
views Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 2013-03-15 16:55:07 +02:00
workers Move git post push logic to service 2013-02-25 21:21:38 +02:00