Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue

CHANGELOG

CONTRIBUTING.md

Gemfile

Gemfile.lock

app/assets/javascripts/behaviors/autosize.js.coffee

app/assets/stylesheets/framework/markdown_area.scss

app/assets/stylesheets/pages/note_form.scss

app/helpers/blob_helper.rb

app/mailers/email_rejection_mailer.rb

app/models/merge_request.rb

app/views/projects/blob/_blob.html.haml

config/initializers/metrics.rb

doc/ci/api/projects.md

features/project/source/browse_files.feature

features/steps/project/source/browse_files.rb

lib/gitlab/regex.rb

spec/fixtures/logo_sample.svg

spec/javascripts/behaviors/autosize_spec.js.coffee

spec/lib/gitlab/regex_spec.rb

spec/models/merge_request_spec.rb