gitlab-org--gitlab-foss/app
Douwe Maan d318075aba Merge branch 'rs-blocks-json-serialization' into 'master'
Add BlocksJsonSerialization model concern and include it in User

Closes #37947

See merge request gitlab-org/gitlab-ce!14350
2017-12-20 12:02:21 +00:00
..
assets Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master' 2017-12-20 08:56:58 +00:00
controllers Use UserSerializer instead of User.to_json 2017-12-19 15:45:08 -06:00
finders
helpers Use UserSerializer instead of User.to_json 2017-12-19 15:45:08 -06:00
mailers Make discussion mail References all notes in the discussion 2017-12-13 21:26:01 +01:00
models Only include the user's ID in the time_spent command's update hash 2017-12-19 15:45:08 -06:00
policies Refactor common protected ref check 2017-12-12 15:07:24 -08:00
presenters Present member collection at the controller level 2017-12-12 18:14:58 +01:00
serializers Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master' 2017-12-18 11:28:02 +00:00
services Merge branch 'rs-blocks-json-serialization' into 'master' 2017-12-20 12:02:21 +00:00
uploaders Support uploads for groups 2017-12-07 12:27:52 +01:00
validators
views Use UserSerializer instead of User.to_json 2017-12-19 15:45:08 -06:00
workers Merge branch 'zj-gitaly-pipelines-n-1' into 'master' 2017-12-19 16:23:00 +00:00