gitlab-org--gitlab-foss/spec/features/security
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03:00
..
profile_access_spec.rb Fix profile emails with new key route 2013-06-24 19:24:27 +03:00
project_access_spec.rb Merge branch 'master' into karlhungus-mr-on-fork 2013-08-08 12:22:09 +03:00