delta/gitlab/gitlab-ce.git, branch rs-ssh-key-title-populate

Restore SSH Key title auto-population behavior

2016-09-12T22:03:30+00:00

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823

Merge branch 'rails-5-backports' into 'master'

2016-09-12T21:02:57+00:00


Fix two problematic bits of code that will be deprecated or broken in Rails 5.

Found in the Rails 5 MR: !5555

These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller.

The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577

See merge request !6214

No need for this variable.

2016-09-12T20:23:32+00:00

Merge branch 'update-templates' into 'master'

2016-09-12T20:10:07+00:00


Update templates.

See merge request !6163

Merge branch '21569-dont-add-created-by-for-matched-users' into 'master'

2016-09-12T20:08:33+00:00


Only add original author tag line when importing from GitHub if there isn't a linked GitLab account

## What does this MR do?
If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line.

## What are the relevant issue numbers?

Closes #21569

See merge request !6081

Merge branch 'document-custom-event-tracking' into 'master'

2016-09-12T17:03:20+00:00


Document how to track custom events

## What does this MR do?

This documents how one can track custom events.

## Are there points in the code the reviewer needs to double check?

Spelling, etc.

## Why was this MR needed?

This wasn't documented.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

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

See merge request !6310

Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' into 'master'

2016-09-12T16:50:07+00:00


While using Gitlab UI to edit a file it changes the file permissions this MR aims to fix it

Closes #21092

See merge request !5979

Merge branch 'issue_21825' into 'master'

2016-09-12T16:15:22+00:00


Add information about user and manual build start to runner as variables

Closes #21825

See merge request !6201

Simplify a condition in Repository#update_file

2016-09-12T16:10:08+00:00

Signed-off-by: Rémy Coutable

Merge branch 'slightly-more-readable' into 'master'

2016-09-12T16:06:41+00:00


Make the cases clear instead of having guards

See merge request !6304