Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

app/assets/javascripts/calendar.js.coffee

app/assets/stylesheets/generic/calendar.scss

app/controllers/admin/services_controller.rb

app/controllers/users_controller.rb

app/models/event.rb

app/models/project_contributions.rb

app/models/repository.rb

app/models/user.rb

app/views/admin/services/_form.html.haml

app/views/users/_projects.html.haml

app/views/users/calendar.html.haml

app/views/users/calendar_activities.html.haml

docker/Dockerfile

features/admin/settings.feature

features/steps/admin/settings.rb

features/steps/user.rb

features/user.feature

lib/gitlab/commits_calendar.rb

lib/gitlab/contributions_calendar.rb