delta/gitlab/gitlab-ce.git/spec/models, branch github-import-docs gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into per-project-pipeline-iid 2018-06-02T02:15:53+00:00 Shinya Maeda shinya@gitlab.com 2018-06-02T02:15:53+00:00 b02b2602c1bcfd60b760fbfd1aca936475d78474 






Merge branch 'sh-bump-ruby-2.4' into 'master'
2018-06-01T17:59:04+00:00

Stan Hu
stanhu@gmail.com

2018-06-01T17:59:04+00:00

81e899ea7141b34a7860f308327249784fb5d6cc

Upgrade to Ruby 2.4.4

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




Upgrade to Ruby 2.4.4

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






Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"
2018-06-01T15:09:08+00:00

🙈  jacopo beschi 🙉
intrip@gmail.com

2018-06-01T15:09:08+00:00

4c8783636cdc279aea802760146d58e6259bed57












Merge branch 'reactive-caching-alive-bug' into 'master'
2018-06-01T14:19:34+00:00

Nick Thomas
nick@gitlab.com

2018-06-01T14:19:34+00:00

c3450ab9eec31a525e3559520b8a010ed5c2c2e8

ReactiveCaching#clear_reactive_cache! should not keep the cache alive

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




ReactiveCaching#clear_reactive_cache! should not keep the cache alive

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






ReactiveCaching#clear_reactive_cache! should clear the not keep the cache alive
2018-06-01T13:35:49+00:00

Tiago Botelho
tiagonbotelho@hotmail.com

2018-06-01T13:15:13+00:00

2535834f8ad35e7691384454013b5938a0a2af5d












Merge branch '46913-appearance-uploader-fields-and-description-html-are-missing-in-cached-version' into 'master'
2018-06-01T13:08:42+00:00

Douwe Maan
douwe@gitlab.com

2018-06-01T13:08:42+00:00

72702275373d466f0f55c925e05c34bba1326761

Resolve "Appearance uploader fields and description HTML are missing in cached version"

Closes #46913

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




Resolve "Appearance uploader fields and description HTML are missing in cached version"

Closes #46913

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






Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'master'
2018-06-01T12:43:43+00:00

Kamil Trzciński
ayufan@ayufan.eu

2018-06-01T12:43:43+00:00

afb2d667cae42b77e090b4b240848c4d4ddcaf2d

Improve validations for Ci::Runner#runner_type

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




Improve validations for Ci::Runner#runner_type

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






Use RequestStore in CacheableAttributes.cached for greater performance
2018-06-01T12:01:27+00:00

Rémy Coutable
remy@rymai.me

2018-05-29T16:39:03+00:00

4eda09e3fbfe82fd1467e97cbc5bd085b91f257d

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Revert to caching the AR object in CacheableAttributes
2018-06-01T11:58:42+00:00

Rémy Coutable
remy@rymai.me

2018-05-29T15:49:52+00:00

a886532cc04bfa7ec6885ea883889f6d138961bd

Caching the attributes as JSON and manually instantiating the record
ended-up very complex since the edge-cases such as upload fields,
serialized fields, and fields with custom accessors had to be handled.

To ensure 3 points out of 4 are checked from https://gitlab.com/gitlab-org/gitlab-ce/issues/45175
we now include the Rails version in the cache key.

Signed-off-by: Rémy Coutable <remy@rymai.me>





Caching the attributes as JSON and manually instantiating the record
ended-up very complex since the edge-cases such as upload fields,
serialized fields, and fields with custom accessors had to be handled.

To ensure 3 points out of 4 are checked from https://gitlab.com/gitlab-org/gitlab-ce/issues/45175
we now include the Rails version in the cache key.

Signed-off-by: Rémy Coutable <remy@rymai.me>







Add validation to webhook and service URLs to ensure they are not blocked because of SSRF
2018-06-01T11:43:53+00:00

Francisco Javier López
fjlopez@gitlab.com

2018-06-01T11:43:53+00:00

840f80d48b7d8363f171f6137cd9f1fbafb52bfc