Commit 69cb5fba authored by Francesco Levorato's avatar Francesco Levorato

Make Project#find_with_namespace case-insensitive

parent ac571623
...@@ -235,10 +235,10 @@ class Project < ActiveRecord::Base ...@@ -235,10 +235,10 @@ class Project < ActiveRecord::Base
return nil unless id.include?('/') return nil unless id.include?('/')
id = id.split('/') id = id.split('/')
namespace = Namespace.find_by(path: id.first) namespace = Namespace.by_path(id.first)
return nil unless namespace return nil unless namespace
where(namespace_id: namespace.id).find_by(path: id.second) where(namespace_id: namespace.id).where("LOWER(projects.path) = :path", path: id.second.downcase).first
end end
def visibility_levels def visibility_levels
......
...@@ -220,6 +220,7 @@ describe Project do ...@@ -220,6 +220,7 @@ describe Project do
end end
it { expect(Project.find_with_namespace('gitlab/gitlabhq')).to eq(@project) } it { expect(Project.find_with_namespace('gitlab/gitlabhq')).to eq(@project) }
it { expect(Project.find_with_namespace('GitLab/GitlabHQ')).to eq(@project) }
it { expect(Project.find_with_namespace('gitlab-ci')).to be_nil } it { expect(Project.find_with_namespace('gitlab-ci')).to be_nil }
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment