Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993

.gitignore

CHANGELOG

Gemfile

Gemfile.lock

Procfile

app/assets/javascripts/application.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/projects_list.js.coffee

app/assets/javascripts/syntax_highlight.coffee

app/assets/javascripts/users_select.js.coffee

app/assets/stylesheets/base/layout.scss

app/assets/stylesheets/base/mixins.scss

app/assets/stylesheets/base/variables.scss

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/generic/header.scss

app/assets/stylesheets/generic/lists.scss

app/assets/stylesheets/generic/sidebar.scss

app/assets/stylesheets/highlight/dark.scss

app/assets/stylesheets/highlight/monokai.scss

app/assets/stylesheets/highlight/solarized_dark.scss