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

..

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 extend_markdown_upload

2015-02-24 14:54:39 +01: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