gitlab-org--gitlab-foss/spec/requests/api
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
..
groups_spec.rb
internal_spec.rb allow all git-upload-* commands for deploy keys 2013-07-30 10:15:36 +02:00
issues_spec.rb
merge_requests_spec.rb
milestones_spec.rb
notes_spec.rb
projects_spec.rb
repositories_spec.rb
session_spec.rb
system_hooks_spec.rb
users_spec.rb