delta/gitlab/gitlab-ce.git/spec/models/concerns, branch bootstrap-markdown-code-highlight gitlab.com: gitlab-org/gitlab-ce.git 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












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>







Export assigned issues in iCalendar feed
2018-05-31T14:01:04+00:00

Imre Farkas
ifarkas@gitlab.com

2018-05-31T14:01:04+00:00

20dfe25c151cc883ce0d38b67125b5ca41e6d422












Upgrade to Ruby 2.4.4
2018-05-29T22:19:33+00:00

Stan Hu
stanhu@gmail.com

2018-05-19T13:03:29+00:00

b5c706326ada2c0d213dd512842c5f677d9d94f9

Fixes that make this work:

* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.

* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.





Fixes that make this work:

* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.

* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.







Merge branch 'sh-batch-dependent-destroys' into 'master'
2018-05-29T17:47:47+00:00

Robert Speicher
robert@gitlab.com

2018-05-29T17:47:47+00:00

efcadd2d3c3eaa1e8d25275d8aef357a2ffb6fcb

Fix project destruction failing due to idle in transaction timeouts

Closes #44610

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




Fix project destruction failing due to idle in transaction timeouts

Closes #44610

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






Merge branch '45190-create-notes-diff-files' into 'master'
2018-05-28T09:47:06+00:00

Douwe Maan
douwe@gitlab.com

2018-05-28T09:47:06+00:00

0a43b25c20010b3eb4c9ab8cef8712df99702fac

Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page

Closes #45190

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




Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page

Closes #45190

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