diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-15 15:11:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-15 15:11:43 +0300 |
commit | 14771dc276c9cfdeed1a3915ee29301cd848b475 (patch) | |
tree | 1ce8d34d64cd1c653be9ad3141c8f99ce8c2f2db /app/services/notes | |
parent | 5f431529c8eb0fd5c84df1e66a38ee88b8da1ba6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/notes')
-rw-r--r-- | app/services/notes/build_service.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 8c250526efc..cc5c81cf280 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -16,6 +16,14 @@ module Notes params.merge!(discussion.reply_attributes) end + # The `confidential` param for notes is deprecated with 15.3 + # and renamed to `internal`. + # We still accept `confidential` until the param gets removed from the API. + # Until we have not migrated the database column to `internal` we need to rename + # the parameter. Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/367923. + params[:confidential] = params[:internal] || params[:confidential] + params.delete(:internal) + new_note(params, discussion) end |