Conflicts:
	db/schema.rb

- Add attribution for Anton Baklanov
- Remove attributions for employees

[ci skip]

Added X-GitLab-... headers to emails from CI and Email On Push services

Fixes #2098

This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and
'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way
that it is done currently for merge requests and issues emails.

Additionally, CI emails will have 'X-GitLab-Build-Status' header with either
'fail' or 'success'.

Emails from Email On Push will include 'X-Gitlab-Author' header containing the
username of user who did the push.

See merge request !2159

Allow LDAP users to change their email if it was not set by the LDAP
server

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054

See merge request !2502

Add public params to GET /projects api. Closes #3788



See merge request !2409

Starring project only increases star count

This is instead of increasing star & fork count

Fixes #11396

![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif)

cc. @jschatz1 

See merge request !2504

Fixes #2098

adds exclamation point when assigned user cannot merge

Fixes: #4175 

See merge request !2408

# Conflicts:
#	db/schema.rb

This is instead of increasing star & fork count

Fixed #11396

Creator should be added as a master of the project on creation

Fixes: #4222

See merge request !2463

Greatly improve external_issue_tracker performance

See 3d41133d48f6522b8755bb91b804864e8e520871 for all the details. As an aside, this commit contains a set of migrations that will introduce downtime as they add a column with a default value which in turn locks the entire table (at least on PostgreSQL).

See merge request !2498

Removes extra line breaks.

This greatly improves the performance of Project#external_issue_tracker
by moving most of the fields queried in Ruby to the database and letting
the database handle all logic. Prior to this change the process of
finding an external issue tracker was along the lines of the following:

1. Load all project services into memory.
2. Reduce the list to only services where "issue_tracker?" returns true
3. Reduce the list from step 2 to service where "default?" returns false
4. Find the first service where "activated?" returns true

This has to two big problems:

1. Loading all services into memory only to reduce the list down to a
   single item later on is a waste of memory (and slow timing wise).
2. Calling Array#select followed by Array#reject followed by Array#find
   allocates extra objects when this really isn't needed.

To work around this the following service fields have been moved to the
database (instead of being hardcoded):

* category
* default

This in turn means we can get the external issue tracker using the
following query:

    SELECT *
    FROM services
    WHERE active IS TRUE
    AND default IS FALSE
    AND category = 'issue_tracker'
    AND project_id = XXX
    LIMIT 1

This coupled with memoizing the result (just as before this commit)
greatly reduces the time it takes for Project#external_issue_tracker to
complete. The exact reduction depends on one's environment, but locally
the execution time is reduced from roughly 230 ms to only 2 ms (= a
reduction of almost 180x).

Fixes gitlab-org/gitlab-ce#10771

Fix double request issue in artifacts browser

This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached.

See merge request !2496

Raise an error on page load when there are pending migrations in
development mode.

Fixes #5990 

See merge request !2491

Fix positioning issues with browse files button

Issue is that in Firefox clipboard is blocking the browse files
from moving all the way to the right.
Move clipboard up 1px into -1px to unblock "browse files"

SS from firefox:

![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png)

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10849


See merge request !2489

Search title gets clipped vertically.

Fixed by adding height to search title css.

**Before:**
![Screen_Shot_2016-01-16_at_10.12.14_AM](/uploads/2651de6ae38251e1f20acade0c69a629/Screen_Shot_2016-01-16_at_10.12.14_AM.png)

**After:**
![Screen_Shot_2016-01-16_at_10.12.05_AM](/uploads/6852e9a653bde1975d7fdfa4dbc302d8/Screen_Shot_2016-01-16_at_10.12.05_AM.png)

See merge request !2460

Reduce margin to fit dropdowns

![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png)

Fixes #10747 

See merge request !2492

Used `issuable` instead

Fixes #10747

Move entry `Fix: As an admin, cannot add oneself as a member to a
group/project`

The CHANGELOG entry said it was fixed in 8.2.3. However, I found
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1942 that
suggests it wasn't fixed until 8.3.0. A customer experienced this
issue on 8.2.3, still. This ultimately led to me investigating this
further.

[ci skip]

See merge request !2488

Fix limit for `data` column in `events` table when using MySQL

Closes #9084 

See merge request !2486

[ci skip]

Update devise to version 3.5.4

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2642

See merge request !2490

Issue is that in Firefox clipboard is blocking the browse files
from moving all the way to the right.
Move clipboard up 1px into -1px to unblock browse files