Merge branch 'master' into developer_can_push_to_protected_branches_option

CHANGELOG

Gemfile

Gemfile.lock

VERSION

app/assets/stylesheets/generic/common.scss

app/helpers/application_helper.rb

app/models/notification.rb

app/services/notification_service.rb

app/views/groups/_settings_nav.html.haml

app/views/layouts/_head_panel.html.haml

app/views/layouts/_public_head_panel.html.haml

app/views/layouts/devise.html.haml

app/views/layouts/nav/_profile.html.haml

app/views/profiles/notifications/show.html.haml

app/views/projects/commits/show.html.haml

app/views/shared/_outdated_browser.html.haml

doc/permissions/permissions.md

features/steps/project/merge_requests.rb

spec/services/notification_service_spec.rb