diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-04-23 15:48:26 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-04-23 15:48:26 +0000 |
commit | ab286656b22dd686a659afe908daade6e5a54ff3 (patch) | |
tree | 538fb10cb2979c616754e492d8fe44500e760a37 /lib/api/helpers/notes_helpers.rb | |
parent | 3d12ce95b1307f9b8439aab9ac5fe9d406ab9b01 (diff) | |
download | gitlab-ce-ab286656b22dd686a659afe908daade6e5a54ff3.tar.gz |
Resolve "Namespace factory is problematic"
Diffstat (limited to 'lib/api/helpers/notes_helpers.rb')
-rw-r--r-- | lib/api/helpers/notes_helpers.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/helpers/notes_helpers.rb b/lib/api/helpers/notes_helpers.rb index cd91df1ecd8..b74b8149834 100644 --- a/lib/api/helpers/notes_helpers.rb +++ b/lib/api/helpers/notes_helpers.rb @@ -64,8 +64,10 @@ module API authorize! :create_note, noteable parent = noteable_parent(noteable) + if opts[:created_at] - opts.delete(:created_at) unless current_user.admin? || parent.owner == current_user + opts.delete(:created_at) unless + current_user.admin? || parent.owned_by?(current_user) end project = parent if parent.is_a?(Project) |