diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-26 11:08:47 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-26 11:08:47 +0000 |
| commit | a03b429c3e7c52f23009a52e2085d7e7e48a3207 (patch) | |
| tree | 22ccc4f184e5914f9958f1c37bfe76c9c5ca360e /app | |
| parent | d1ceb60068c9c1a8a91e20ddffc108f82f313790 (diff) | |
| parent | 22addf26732e15bd63112c21f03a7f20c5feabc9 (diff) | |
| download | gitlab-ce-a03b429c3e7c52f23009a52e2085d7e7e48a3207.tar.gz | |
Merge branch 'jprovazn-issuable-data' into 'master'
Don't convert issuable_initial_data into JSON
See merge request gitlab-org/gitlab-ce!17318
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 7cd84fe69c9..44ecc2212f2 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -234,7 +234,7 @@ module IssuablesHelper data.merge!(updated_at_by(issuable)) - data.to_json + data end def updated_at_by(issuable) diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 7bc5c46d64a..d63443c9da5 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -55,7 +55,7 @@ .issue-details.issuable-details .detail-page-description.content-block - %script#js-issuable-app-initial-data{ type: "application/json" }= issuable_initial_data(@issue) + %script#js-issuable-app-initial-data{ type: "application/json" }= issuable_initial_data(@issue).to_json #js-issuable-app %h2.title= markdown_field(@issue, :title) - if @issue.description.present? |