diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-12-21 23:30:50 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-12-21 23:30:50 +0000 |
| commit | 06cef29a62fbab4174b669a6d5e2059f1f5d8756 (patch) | |
| tree | d7539e2836ff95ddeae32d5d351bb9d624e12037 /spec/views | |
| parent | 88094c44f5dc5d88f378a9c3a055687a7d09e6f1 (diff) | |
| parent | 95aae95a1cbb55facd127c74d6c044b13533f3fe (diff) | |
| download | gitlab-ce-06cef29a62fbab4174b669a6d5e2059f1f5d8756.tar.gz | |
Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'
Resolve "Create a serializer to render issuables sidebar"
Closes #44984
See merge request gitlab-org/gitlab-ce!23379
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/merge_requests/show.html.haml_spec.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index fa6c4ce4ac8..b0042be339c 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -32,6 +32,11 @@ describe 'projects/merge_requests/show.html.haml' do assign(:noteable, closed_merge_request) assign(:notes, []) assign(:pipelines, Ci::Pipeline.none) + assign( + :issuable_sidebar, + MergeRequestSerializer.new(current_user: user, project: project) + .represent(closed_merge_request, serializer: 'sidebar') + ) preload_view_requirements |