Conflicts:
	app/controllers/omniauth_callbacks_controller.rb

Sorting users in admin

See merge request !1170

Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169

These changes are ported from EE to CE. Apply changes for app directory

Improve event note display in dashboard and project activity views

minor updates to mysql cleanup

Improve event note display in dashboard and project activity views

* take -> make
* correct incorrect details about when pool size was changed

simplify schema.rb reset in upgrade guides

Cleanup MySQL database

Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.

Addresses changes made to installation guide and config files but never
applied in update process. Relevant changes to installation guide and
config files were made in
gitlabhq@cbb5b00,
gitlabhq@498a4e6,
gitlabhq@c33d5e1,
gitlabhq@485162e#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@72e2fe2#diff-d1b4ff7de834bae6008dd49550413a6f,
gitlabhq@5163a8f#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@993af5d#diff-e1059d0fa0437ffad94facff86210603,
&
gitlabhq@d3f5a0c.

Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171

Notes on the dashboard views are truncated to 150 characters; this
change ensures that when a link's text is truncated it still points to
the correct URL.

Bug with apostrophe when at mentioning users

This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`.

Fixes #1034

See merge request !1165

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164

improve wording on protected branches page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Ssl ciphers update

See merge request !1168

This reverts commit c41e5f50.