delta/gitlab/gitlab-ce.git, branch 45190-create-notes-diff-files gitlab.com: gitlab-org/gitlab-ce.git Persist truncated note diffs on a new table 2018-05-24T18:34:43+00:00 Oswaldo Ferreira oswaldo@gitlab.com 2018-05-16T15:46:18+00:00 bb8f2520b4254c9dabe377df48e29c5f17894a1d We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info. 
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' 2018-05-23T16:53:29+00:00 Douwe Maan douwe@gitlab.com 2018-05-23T16:53:29+00:00 ddc760a0d625706196629c061f9dfa1cd2d8402e Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754 
Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"

Closes #45175

See merge request gitlab-org/gitlab-ce!18754
 Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' 2018-05-23T16:51:43+00:00 Achilleas Pipinellis axil@gitlab.com 2018-05-23T16:51:43+00:00 610aefe43440a7eae8e317aa0a2ed43f0437db98 Update keyboard shortcut conventions See merge request gitlab-org/gitlab-ce!19014 
Update keyboard shortcut conventions

See merge request gitlab-org/gitlab-ce!19014
 Update keyboard shortcut conventions 2018-05-23T16:51:43+00:00 Andreas Kämmerle akaemmerle@gitlab.com 2018-05-23T16:51:43+00:00 137c949e9b18b6ce6332cd0c951da2b8dc35322d 






Merge branch 'fix/devops-remove-beta' into 'master'
2018-05-23T16:51:35+00:00

Tim Zallmann
tzallmann@gitlab.com

2018-05-23T16:51:35+00:00

a2658b086afbeefea29ce3df61d707ed74602481

removed "(Beta)" from "Auto DevOps" messages

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




removed "(Beta)" from "Auto DevOps" messages

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






Merge branch '46505-update-autodevops-docs' into 'master'
2018-05-23T16:34:33+00:00

Achilleas Pipinellis
axil@gitlab.com

2018-05-23T16:34:33+00:00

a352c0d584f0e72a9c825199297f60730221f7ee

Add documentation of variables usage for disabling/enabling jobs in  Auto DevOps

Closes #46505

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




Add documentation of variables usage for disabling/enabling jobs in  Auto DevOps

Closes #46505

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






Add documentation of variables usage for disabling/enabling jobs in  Auto DevOps
2018-05-23T16:34:33+00:00

Tomasz Maczukin
tomasz@gitlab.com

2018-05-23T16:34:33+00:00

e7de169a7d295210fc4b7194f3f17907fb6ae7e4












Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'
2018-05-23T16:15:26+00:00

Rémy Coutable
remy@rymai.me

2018-05-23T16:15:26+00:00

63379a2ae7f04f533780ee53c04a0d2847c600aa

Resolve "Prometheus integration fails on k8s 1.10"

Closes #46259

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




Resolve "Prometheus integration fails on k8s 1.10"

Closes #46259

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






Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'
2018-05-23T15:40:00+00:00

Douwe Maan
douwe@gitlab.com

2018-05-23T15:40:00+00:00

31413f4c1469ebffe00cc657c3f94a59b48ace07

Upgrading from EE to CE fails on project_mirror_data migrations

Closes #46630

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




Upgrading from EE to CE fails on project_mirror_data migrations

Closes #46630

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






Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'
2018-05-23T15:28:14+00:00

Rémy Coutable
remy@rymai.me

2018-05-23T15:28:14+00:00

83796a718d097114c6848b0c24fa45d96c4499d2

Render 404 when prometheus adapter is disabled in Prometheus metrics controller

Closes #46413

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




Render 404 when prometheus adapter is disabled in Prometheus metrics controller

Closes #46413

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