diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-18 11:28:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-18 11:28:02 +0000 |
| commit | 3870a1bde276144a05a31185ede7a5032818d489 (patch) | |
| tree | 0e8d69c1859be1d59de6a2edd1abf599d3618948 /app/helpers | |
| parent | c20720cf84132d7bf14763aba0570bd8882f9c6d (diff) | |
| parent | cba40a1f551e4c1b46bfa49a709f59feb59782bd (diff) | |
| download | gitlab-ce-3870a1bde276144a05a31185ede7a5032818d489.tar.gz | |
Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'
Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests
See merge request gitlab-org/gitlab-ce!15847
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 4c60f4b0cd0..b4ca0e68e0b 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -32,7 +32,7 @@ module IssuablesHelper end end - def serialize_issuable(issuable) + def serialize_issuable(issuable, serializer: nil) serializer_klass = case issuable when Issue IssueSerializer @@ -42,7 +42,7 @@ module IssuablesHelper serializer_klass .new(current_user: current_user, project: issuable.project) - .represent(issuable) + .represent(issuable, serializer: serializer) .to_json end |