gitlab-org--gitlab-foss/app/views/shared
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
..
_clone_panel.html.haml
_filter.html.haml Dashboard/Group issues and mr pages refactoring 2013-08-06 21:12:01 +03:00
_issues.html.haml Increase amount of search results for issues, mr, projects 2013-08-07 22:51:36 +03:00
_merge_requests.html.haml Merge branch 'master' into karlhungus-mr-on-fork 2013-08-08 12:22:09 +03:00
_no_ssh.html.haml
_promo.html.haml
_ref_switcher.html.haml