Riyad Preukschas db2c15369c Merge branch 'master' into discussions ...

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

2012-12-23 01:03:57 +01:00

..

admin

Improve admin views for project and groups

2012-11-28 18:04:28 +01:00

dashboard

Spinach test added

2012-11-28 19:59:19 +02:00

group

Remove backward compatibility of factories.

2012-11-13 22:27:45 +11:00

profile

Improve user feedback on the Profile > Design page

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

project

Merge branch 'master' into discussions

2012-12-23 01:03:57 +01:00

shared

Add merge request note feature

2012-12-03 22:51:55 +01:00