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

Upgrade to Rails 4.1.9

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

dashboard

Merge branch 'master' into rails-4.1.9

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

explore

Upgrade to Rails 4.1.9

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

profile

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

project

Merge branch 'master' into rails-4.1.9

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

shared

Merge branch 'master' into rails-4.1.9

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

snippets

Fix raw view for public snippets

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

groups.rb

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

search.rb

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.rb

Replace old spinach step definitions with step.

2014-09-22 10:01:50 +02:00

user.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00