diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
| commit | a6af6bf6e21bb5b36a94ba334c99bc586cb3297b (patch) | |
| tree | 41a63f8d85f562573f45aa5898d749ceb51606a5 /lib/api/features.rb | |
| parent | ac8f85805c0ff7dd00072b2974fdd05724863816 (diff) | |
| parent | a1ee2072f1a7c197e13bd2d5f8ca59ad1deb1c49 (diff) | |
| download | gitlab-ce-prettify-all-the-things-7.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-7'prettify-all-the-things-7
# Conflicts:
# app/assets/javascripts/activities.js
Diffstat (limited to 'lib/api/features.rb')
| -rw-r--r-- | lib/api/features.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/features.rb b/lib/api/features.rb index 6f2422af13a..1331248699f 100644 --- a/lib/api/features.rb +++ b/lib/api/features.rb @@ -20,7 +20,7 @@ module API def gate_targets(params) targets = [] targets << Feature.group(params[:feature_group]) if params[:feature_group] - targets << User.find_by_username(params[:user]) if params[:user] + targets << UserFinder.new(params[:user]).find_by_username if params[:user] targets end |