Commit graph

5 commits

Author SHA1 Message Date
Douwe Maan
1615d3de39 Add tests. 2015-04-17 11:33:58 +02:00
Douwe Maan
769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan
0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Douwe Maan
2570e4df79 Fix specs. 2015-02-20 16:55:38 +01:00
Douwe Maan
d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00