delta/gitlab/gitlab-ce.git/app/serializers, branch docs-pages-https

Check MR state before submitting queries for discussion state

2018-01-30T01:53:47+00:00

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

Remove soft removals related code

2018-01-08T16:04:45+00:00

This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.

This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447

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

Merge branch '22643-manual-job-page' into 'master'

2018-01-06T14:40:45+00:00

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

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

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

Merge branch 'master' into 22643-manual-job-page

2018-01-04T22:39:01+00:00

* master: (200 commits)
  Fix issue boards scroll config.
  Added multi editor setting on the profile preferences page
  fix missing import of timeWeek which would cause errors in prometheus graphs with deployments
  Remove downcase from special path helper
  Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}
  Fix error when viewing diffs without blobs
  Moves prettier to dev dependency
  Eager load event target authors whenever possible
  Do not run ee_compat_check on security branches
  Include integration tests in CE/EE testing documentation
  41054-Disallow creation of new Kubernetes integrations
  Resolve "Resizable file list and commit panel"
  Make tooltip placement bottom by default as per design guidelines
  Fix groups list icon, timestamp alignment and row height
  Avoid leaving a push event empty if payload cannot be created
  Move git operations for UpdateRemoteMirrorService into Gitlab::Git
  Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Update Kubernetes service documentation
  fix issue #37843
  ...

Simplify metrics fetching for closed/merged MRs

2018-01-03T13:57:07+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.