delta/gitlab/gitlab-ce.git/app, branch sentry-integration

Target '_blank'

2016-01-20T15:18:42+00:00

Send user context to Sentry

2016-01-20T15:15:19+00:00

Use sentry in env production only

2016-01-20T08:48:38+00:00

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration

2016-01-20T08:07:10+00:00

Conflicts:
	db/schema.rb

Merge branch 'add_email_headers' into 'master'

2016-01-19T21:23:54+00:00


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

Merge branch 'user-ldap-email' into 'master'

2016-01-19T19:15:23+00:00


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

Merge branch 'add-public-param-to-project-api' into 'master'

2016-01-19T18:51:38+00:00


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



See merge request !2409

Merge branch 'star-button-fork-count-increase' into 'master'

2016-01-19T18:41:26+00:00


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

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

2016-01-19T18:18:39+00:00

Fixes #2098

Merge branch 'display-message-when-assignee-cannot-merge' into 'master'

2016-01-19T17:35:29+00:00


adds exclamation point when assigned user cannot merge

Fixes: #4175 

See merge request !2408