delta/gitlab/gitlab-ce.git/spec, branch ruby_version

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

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

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

Fixes #2098

Merge branch 'master' into user-ldap-email

2016-01-19T17:30:59+00:00

# Conflicts:
#	db/schema.rb

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

2016-01-19T15:25:38+00:00

Fix creator should be added as a master of the project on creation

2016-01-19T15:24:42+00:00

Add specs. Adjust filter.

2016-01-19T14:57:00+00:00

Merge branch 'fix-consider-re-assign-as-a-mention'

2016-01-19T10:37:14+00:00

Update build artifacts metadata fixture to 0.0.2

2016-01-18T18:58:16+00:00