diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-09 17:37:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-09 17:37:26 +0000 |
| commit | 5e1a802b15af4ba991f9ed85a691f1a925cc0edf (patch) | |
| tree | 72afca9c9cbeff206e8a38302ffdb9c09827e7dd /lib/api/notes.rb | |
| parent | 8265fe3954e225d58567878fd9200acbe84ad296 (diff) | |
| parent | 11aff97d88e32effe5d8e16caccb9d23b9a4995a (diff) | |
| download | gitlab-ce-5e1a802b15af4ba991f9ed85a691f1a925cc0edf.tar.gz | |
Merge branch 'remove_is_admin' into 'master'
Remove the `User#is_admin?` method
Closes #30584
See merge request !10520
Diffstat (limited to 'lib/api/notes.rb')
| -rw-r--r-- | lib/api/notes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/notes.rb b/lib/api/notes.rb index de39e579ac3..e281e3230fd 100644 --- a/lib/api/notes.rb +++ b/lib/api/notes.rb @@ -78,7 +78,7 @@ module API } if can?(current_user, noteable_read_ability_name(noteable), noteable) - if params[:created_at] && (current_user.is_admin? || user_project.owner == current_user) + if params[:created_at] && (current_user.admin? || user_project.owner == current_user) opts[:created_at] = params[:created_at] end |