delta/gitlab/gitlab-ce.git/app, branch ruby_version gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'add_email_headers' into 'master' 2016-01-19T21:23:54+00:00 Robert Speicher robert@gitlab.com 2016-01-19T21:23:54+00:00 1f9c360d7ba8dc2a35321c631bbbcf624b9d8bd3 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 

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 Robert Speicher robert@gitlab.com 2016-01-19T19:15:23+00:00 b9fca47854dd92415e2d4d3b68e2e967fee2d67b 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 

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 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-01-19T18:51:38+00:00 20cc4bc47533f34b62b7c8283e8de4eee8c5b852 Add public params to GET /projects api. Closes #3788 See merge request !2409 

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 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-01-19T18:41:26+00:00 084614dec8e135eafc8d1868ee0d2f75ab722c33 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 

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 Anton Baklanov antonbaklanov@gmail.com 2015-12-19T19:04:40+00:00 84124380e815e549f50d82051b2b546c12d9a724 Fixes #2098 
Fixes #2098
Merge branch 'display-message-when-assignee-cannot-merge' into 'master' 2016-01-19T17:35:29+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-01-19T17:35:29+00:00 340df52bc7734ff76e75aae113313259e42680fb adds exclamation point when assigned user cannot merge Fixes: #4175 See merge request !2408 

adds exclamation point when assigned user cannot merge

Fixes: #4175 

See merge request !2408
 Merge branch 'master' into user-ldap-email 2016-01-19T17:30:59+00:00 Douwe Maan douwe@gitlab.com 2016-01-19T17:30:59+00:00 4f44455626a567c939bf6f84684e8879ce2db829 # Conflicts: # db/schema.rb 
# Conflicts:
#	db/schema.rb
when starring a project it correctly increase the star count 2016-01-19T16:48:53+00:00 Phil Hughes me@iamphill.com 2016-01-19T16:48:43+00:00 2821306a740d62153b1a9192cb912b04b42b9279 This is instead of increasing star & fork count Fixed #11396 
This is instead of increasing star & fork count

Fixed #11396
Merge branch 'fix-project-creation' into 'master' 2016-01-19T16:37:06+00:00 Douwe Maan douwe@gitlab.com 2016-01-19T16:37:06+00:00 c8d66514efcf946f847cb3120b271d8f0f0327f2 Creator should be added as a master of the project on creation Fixes: #4222 See merge request !2463 

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

Fixes: #4222

See merge request !2463
 Merge branch 'improve-project-external-issue-trackers' into 'master' 2016-01-19T15:39:22+00:00 Douwe Maan douwe@gitlab.com 2016-01-19T15:39:22+00:00 dec341ca39b25554fa8b6602e848081b968a3049 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 

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