gitlab-org--gitlab-foss/spec/features
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
atom Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
security Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
gitlab_flavored_markdown_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
help_pages_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
issues_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
notes_on_merge_requests_spec.rb Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
profile_spec.rb Even more hound fixes 2015-02-12 21:00:55 +01:00
projects_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
search_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
users_spec.rb Redirect signup page to signin page. 2015-02-05 15:56:28 +01:00