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

CHANGELOG

app/assets/javascripts/blob/blob.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/line_highlighter.js.coffee

app/controllers/passwords_controller.rb

app/controllers/profiles/two_factor_auths_controller.rb

app/controllers/sessions_controller.rb

app/models/ability.rb

app/models/user.rb

app/views/admin/users/show.html.haml

app/views/profiles/accounts/show.html.haml

app/views/projects/_issuable_form.html.haml

app/views/shared/_file_highlight.html.haml

doc/raketasks/maintenance.md

doc/ssh/README.md

features/project/source/multiselect_blob.feature

features/snippets/snippets.feature

features/steps/project/source/multiselect_blob.rb

features/steps/shared/authentication.rb

features/steps/snippets/snippets.rb