Merge branch 'master' into markdown-tags

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/application.js.coffee

...vascripts/behaviors/toggle_diff_line_wrap_behavior.coffee

app/assets/javascripts/calendar.js.coffee

app/assets/javascripts/issue.js.coffee

app/assets/javascripts/merge_request.js.coffee

app/assets/javascripts/notes.js.coffee

app/assets/javascripts/notes_votes.js.coffee

app/assets/stylesheets/base/gl_variables.scss

app/assets/stylesheets/base/variables.scss

app/assets/stylesheets/generic/calendar.scss

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/generic/files.scss

app/assets/stylesheets/generic/forms.scss

app/assets/stylesheets/generic/lists.scss

app/assets/stylesheets/generic/nav_sidebar.scss

app/assets/stylesheets/generic/selects.scss

app/assets/stylesheets/generic/timeline.scss