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

CHANGELOG

Gemfile

Gemfile.lock

app/assets/images/mailers/gitlab_header_logo.png

app/assets/images/mailers/gitlab_tanuki_2x.png

app/assets/javascripts/application.js.coffee

app/assets/javascripts/calendar.js.coffee

app/assets/javascripts/layout_nav.js.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/framework/calendar.scss

app/assets/stylesheets/framework/nav.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/mailers/devise.scss

app/assets/stylesheets/pages/issues.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/pipelines.scss

app/assets/stylesheets/pages/profile.scss

app/controllers/users_controller.rb

app/helpers/events_helper.rb

app/helpers/issues_helper.rb