summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-08 18:19:11 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-05-03 02:11:51 +0900
commit83d02a0b609ea71ef8448b9012221962dda69aba (patch)
treebd52f4a84e4ed2747883361aa1c82df4101b0396
parenta46c91f43225931f94a7d3c7f47beef82152f0ce (diff)
downloadgitlab-ce-83d02a0b609ea71ef8448b9012221962dda69aba.tar.gz
Change name to username
-rw-r--r--app/finders/pipelines_finder.rb2
-rw-r--r--spec/finders/pipelines_finder_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
index aa0210fa7f2..c01a1a73666 100644
--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -81,7 +81,7 @@ class PipelinesFinder
def by_username(items)
if params[:username].present?
- items.joins(:user).where("users.name = ?", params[:username])
+ items.joins(:user).where("users.username = ?", params[:username])
else
items
end
diff --git a/spec/finders/pipelines_finder_spec.rb b/spec/finders/pipelines_finder_spec.rb
index aa8ad66cdf4..3a840eca44f 100644
--- a/spec/finders/pipelines_finder_spec.rb
+++ b/spec/finders/pipelines_finder_spec.rb
@@ -144,7 +144,7 @@ describe PipelinesFinder do
context 'when a username is passed' do
context 'when a username exists' do
- let(:params) { { username: user1.name } }
+ let(:params) { { username: user1.username } }
it 'selects all pipelines which belong to the username' do
expect(subject).to match_array(Ci::Pipeline.where(user: user1))