delta/gitlab/gitlab-ce.git, branch api-fix-user-creation gitlab.com: gitlab-org/gitlab-ce.git API: Fix user creation with external identity 2017-01-04T10:35:46+00:00 Robert Schilling rschilling@student.tugraz.at 2017-01-04T10:35:46+00:00 091e66ebe3e63ad18075b10c44f36cb2e98d9f32 






Merge branch 'ldap_person_attributes' into 'master'

2017-01-03T21:11:10+00:00

Robert Speicher
robert@gitlab.com

2017-01-03T21:11:10+00:00

115aac77f614a9130aa9bc6ff48aed47339aebfc


Gitlab::LDAP::Person uses LDAP attributes configuration

Closes #26290

See merge request !8418





Gitlab::LDAP::Person uses LDAP attributes configuration

Closes #26290

See merge request !8418






Merge branch '25580-trucate-dropdown-for-long-branch' into 'master'

2017-01-03T19:39:33+00:00

Fatih Acet
acetfatih@gmail.com

2017-01-03T19:39:33+00:00

8daff07ca70aeefb0fc11541b77298570de4f47e


Resolves overflow of dropdown text for long branch name

Closes #25580

See merge request !8118





Resolves overflow of dropdown text for long branch name

Closes #25580

See merge request !8118






Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master'

2017-01-03T19:32:54+00:00

Fatih Acet
acetfatih@gmail.com

2017-01-03T19:32:54+00:00

8fa58c719b42458603adb9397766d9dc570689fa


Resolve changing "from" version in diff comparison does not preserve "to" version

Closes #25836

See merge request !8328





Resolve changing "from" version in diff comparison does not preserve "to" version

Closes #25836

See merge request !8328






Gitlab::LDAP::Person uses LDAP attributes configuration
2017-01-03T19:26:47+00:00

Drew Blessing
drew@gitlab.com

2017-01-03T16:05:47+00:00

babb7d5260087abfe09d7c4d6994433def7d8b99

We allow users to configure LDAP attribute preferences. For example,
email can be configured to use `mail`, `email` and `userPrincipalName`,
falling through to the next until a value is found. Prior to this
change, Gitlab::LDAP::Person did not honor this configuration. Now,
the class will honor `name` and `mail` configuration. It does not
handle `username`, or fallback to `first_name` + `last_name` in the
absence of `name`.





We allow users to configure LDAP attribute preferences. For example,
email can be configured to use `mail`, `email` and `userPrincipalName`,
falling through to the next until a value is found. Prior to this
change, Gitlab::LDAP::Person did not honor this configuration. Now,
the class will honor `name` and `mail` configuration. It does not
handle `username`, or fallback to `first_name` + `last_name` in the
absence of `name`.







Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into 'master'

2017-01-03T18:47:25+00:00

Fatih Acet
acetfatih@gmail.com

2017-01-03T18:47:25+00:00

b23fd4e9ea79732f2639636c31525fa7756036ca


Resolve "Label autocomplete doesn't handle spaces after `~~`"

Closes #25964, #22058, and #23578

See merge request !8254





Resolve "Label autocomplete doesn't handle spaces after `~~`"

Closes #25964, #22058, and #23578

See merge request !8254






Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into 'master'

2017-01-03T18:37:28+00:00

Fatih Acet
acetfatih@gmail.com

2017-01-03T18:37:28+00:00

db7a063dd28287fe7ba94982a48c8c9e185ab7eb


Disable award emoji button but display tooltip

Closes #26168

See merge request !8382





Disable award emoji button but display tooltip

Closes #26168

See merge request !8382






Merge branch 'additional-award-emoji-repositioning-fixes' into 'master'

2017-01-03T17:29:13+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-01-03T17:29:13+00:00

4d253c356fc509d9bcc60e77a016d40ba66957f8


Removed bottom padding from merge manually from CLI because of repositioning award emoji's

See merge request !8398





Removed bottom padding from merge manually from CLI because of repositioning award emoji's

See merge request !8398






Merge branch 'regression-note-headline-light' into 'master'

2017-01-03T17:23:06+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-01-03T17:23:06+00:00

5136e72c31681e8c443074ed1443db4cb69e8fbe


Fixed regression of note-headline-light where it was always placed on 2 lines, e…

See merge request !8348





Fixed regression of note-headline-light where it was always placed on 2 lines, e…

See merge request !8348






Merge branch 'use-stable-icon-url' into 'master'

2017-01-03T15:53:04+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-01-03T15:53:04+00:00

365612ce3602858c51902e735d0daea6e1987ba8


Use stable icon for Mattermost integration

See merge request !8252





Use stable icon for Mattermost integration

See merge request !8252