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

..

issues

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

merge_requests

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

milestones

Add group service spec.

2014-06-30 15:00:12 +02:00

notes

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

projects

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

event_create_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

git_push_service_spec.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

git_tag_push_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

notification_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

search_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

system_hooks_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

test_hook_service_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00