Merge branch 'master' into update_api_messages

.ruby-version

CHANGELOG

Gemfile

Gemfile.lock

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/generic/forms.scss

app/assets/stylesheets/generic/markdown_area.scss

app/assets/stylesheets/sections/events.scss

app/assets/stylesheets/sections/merge_requests.scss

app/controllers/projects/milestones_controller.rb

app/helpers/dashboard_helper.rb

app/helpers/groups_helper.rb

app/helpers/milestones_helper.rb

app/models/event.rb

app/models/group.rb

app/models/merge_request.rb

app/models/project_services/hipchat_service.rb

app/services/merge_requests/auto_merge_service.rb

app/services/merge_requests/base_merge_service.rb

app/services/merge_requests/build_service.rb