gitlab-org--gitlab-foss/spec
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
2015-02-21 12:55:28 -07:00
..
controllers Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -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 Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -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