• Dmitriy Zaporozhets's avatar
    Merge branch 'master' into karlhungus-mr-on-fork · 4537623d
    Dmitriy Zaporozhets authored
    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
    4537623d
_discussion.html.haml 2.29 KB