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
..
create_service_spec.rb	Updated rspec to rspec 3.x syntax	2015-02-12 19:17:35 +01:00
fork_service_spec.rb	Updated rspec to rspec 3.x syntax	2015-02-12 19:17:35 +01:00
transfer_service_spec.rb	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
update_service_spec.rb	Updated rspec to rspec 3.x syntax	2015-02-12 19:17:35 +01:00
upload_service_spec.rb	Refactor.	2015-02-17 22:23:31 +01:00