Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-event-error

.rubocop.yml

CHANGELOG

GITLAB_SHELL_VERSION

Gemfile

Gemfile.lock

app/assets/images/emoji.png

app/assets/images/emoji@2x.png

app/assets/javascripts/application.js.coffee

app/assets/javascripts/ci/build.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/dropzone_input.js.coffee

app/assets/javascripts/gfm_auto_complete.js.coffee

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/importer_status.js.coffee

app/assets/javascripts/issuable.js.coffee

app/assets/javascripts/labels_select.js.coffee

app/assets/javascripts/lib/cropper.js.coffee

app/assets/javascripts/lib/utils/common_utils.js.coffee

app/assets/javascripts/lib/utils/text_utility.js.coffee

app/assets/javascripts/milestone_select.js.coffee