gitlab-org--gitlab-foss/spec
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
..
controllers Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
factories Annotate models 2015-02-02 10:24:40 -08:00
features Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
finders Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
fixtures Add trailing newline to all text files. 2014-06-21 11:20:22 +02:00
helpers Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
javascripts Add trailing newline to all text files. 2014-06-21 11:20:22 +02:00
lib Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
mailers Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
models Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
requests/api Improve broadcast message API 2015-02-18 14:58:20 -08:00
routing Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
services Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
support TestEnv improvements 2015-02-16 20:36:34 -05:00
tasks/gitlab Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
workers Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
factories.rb Remove unneeded password_confirmation from seed. 2014-12-28 14:42:15 +01:00
factories_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
spec_helper.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00