diff options
author | Stan Hu <stanhu@gmail.com> | 2018-12-17 23:51:28 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-12-17 23:51:28 +0000 |
commit | 18c78901bc49055bbfea44f4800e073847a89ad2 (patch) | |
tree | decac064c509351df5cbe07eccbe7c754ed1b559 /app/assets/stylesheets/pages/merge_conflicts.scss | |
parent | 41b4f9fef62096e3191e0013efd216c756d7abb9 (diff) | |
parent | 279be8aaa28a1f5c6e6e8601eb0df579cbaf1eeb (diff) | |
download | gitlab-ce-18c78901bc49055bbfea44f4800e073847a89ad2.tar.gz |
Merge branch '8765-geo-gitlab-geo-should-not-serialize-activerecord-objects' into 'master'
Change SafeRequestStore#write to accept an options hash
See merge request gitlab-org/gitlab-ce!23891
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
0 files changed, 0 insertions, 0 deletions