delta/gitlab/gitlab-ce.git/spec/serializers, branch gitlab-git-spawn-env

Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'

2018-01-17T01:04:51+00:00

[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`

See merge request gitlab/gitlabhq!2276

(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)

1f2bd3c0 Backport to 10.3

Merge branch '40549-render-emoj-in-groups-overview' into 'master'

2018-01-08T11:34:22+00:00

Resolve "No Rendering of emoji's in Group-Overview after update"

Closes #40549

See merge request gitlab-org/gitlab-ce!16098

Backport 'Rebase' feature from EE to CE

2018-01-05T08:34:59+00:00

When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.

This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)

Closes #40301

Fixes spec failures due to not returning metrics for MRs other than closed/merged

2018-01-02T21:27:00+00:00

Cache merged and closed events data in merge_request_metrics table

2018-01-02T19:45:25+00:00

Rendering of emoji's in Group-Overview

2017-12-24T11:14:17+00:00

Allows rendering of emoji's in the Group Overview.

Extend Cluster Applications to allow installation of Prometheus

2017-12-22T17:23:43+00:00

Fall back to the `MergeRequestWidgetEntity`

2017-12-21T14:35:54+00:00

When no serializer was passed.

Load commit in batches for pipelines#index

2017-12-19T09:05:40+00:00

Uses `list_commits_by_oid` on the CommitService, to request the needed
commits for pipelines. These commits are needed to display the user that
created the commit and the commit title.

This includes fixes for tests failing that depended on the commit
being `nil`. However, now these are batch loaded, this doesn't happen
anymore and the commits are an instance of BatchLoader.

Stop sending milestone and labels data over the wire for MR widget

2017-12-15T17:31:16+00:00

requests