Make new and edit file submit more uniform
Refactor OAuth refactorings to CE
Merge pull request #8020 from mr-vinn/note-trunc-link

Improve event note display in dashboard and project activity views
Add refactoring for multiple LDAP server support

These changes are ported from EE to CE. Apply changes for app directory
Merge branch 'feature-oauth-refactoring' into 'master'

Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Add config changes for mutliple LDAP support (EE only)
Apply configuration changes for Multiple LDAP servers
Admin: user sorting
Merge branch 'sorting-users-in-admin' into 'master'

Sorting users in admin

See merge request !1170
Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
Refactor lib files for multiple LDAP groups
Merge tests to support Multiple LDAP groups
Merge pull request #7942 from cirosantilli/commit-changes-uppercase

Make new and edit file submit more uniform
update changelog

Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020
Merge pull request #8027 from bbodenmiller/patch-7

update changelog
Remove unused method
DRY find method to find Gitlab user
Move dynamic omniauth declarations to initializer
Add specs for authentication and config