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

..

admin

Spinach for admin applications

2015-01-19 11:18:00 -08:00

dashboard

Fix specs.

2015-02-13 14:43:31 +01:00

explore

Fix spinach tests

2014-12-24 14:34:37 +02:00

profile

Remove password strength indicator

2015-01-15 14:10:13 +01:00

project

Fix active tab tests

2015-02-19 17:24:34 -08:00

snippets

Fix raw view for public snippets

2014-10-27 11:51:31 +02:00

steps

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

support

Fixed tests for spinach

2015-02-12 19:48:42 +01:00

groups.feature

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

search.feature

Fixes the search test that fails whenever faker uses a name with Bar in it. Limit check to being within the search results div.

2014-12-08 16:44:06 -08:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Fix tests for user page

2014-06-02 13:43:07 +03:00