Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"

Rspec upgrade

Clean username acquired from OAuth/LDAP.

Fixes #1967.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813

See merge request !1500

Show assignees in the merge-requests index

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Use gitattribute merge=union to reduce CHANGELOG merge conflicts.

See gitlab/organization#137.

Tested and found working!

@sytse How would you like to address this in [the article](https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/)? Simply replace "Thanks ayufan, we'll try this instead." by "Thanks ayufan, we've implemented this instead."?

See merge request !1505

Fixes #1967.

Issues trackers template

If admin defines service template, service in project will be prefilled with the template data.

See merge request !1503

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

requests/api/project_spec.rb speed up

note about latest details being on master branch

Adds new label color suggestions

This adds a bunch of label color suggestions

![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png)
![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png)

See merge request !289

Edit group members via API

Fixes #1840.  Implement a new API endpoint to update the access level of an existing group member.  Includes new tests and updated API docs.

cc @sytse @douwe

See merge request !1504

Add an API endpoint to update the access level of an existing group
member.

Revise main README for cleanup and some minor clarifications

Update Emoji Cheat Sheet Link

The emoji cheat sheet link was changed. Commit changes the url to the
updated link and fixes issue #8554.

Fix link to SSH help page.

Closes #1981.

See merge request !1502

Fix Issue 1064

Fixes broken doc links within the installation section, as described in:

https://gitlab.com/gitlab-org/gitlab-ce/issues/1064

See merge request !334