gitlab-org--gitlab-foss/app/views/search
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
..
_blob.html.haml scss: rename file_content to file-content etc 2013-07-13 09:52:47 +03:00
_filter.html.haml made some ui enhancement for search page 2013-05-09 11:47:09 +03:00
_result.html.haml Style changes from review with @randx 2013-07-17 22:48:03 -04:00
show.html.haml use control-group classes for inline forms in rest pages 2013-08-07 23:32:20 +03:00