diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 11:04:56 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 11:04:56 -0800 |
commit | 4d56c359d343ba3a1117dfc06034820a415450d3 (patch) | |
tree | 40232c2176dc8f46e7ab96de0bd45c1bc2934173 /app/models/project.rb | |
parent | 1018cbdc803d56e6cae385aee97aa04752d3e3fb (diff) | |
parent | a3f645ef51ec12ce93934b4ddb11313613d8c451 (diff) | |
download | gitlab-ce-4d56c359d343ba3a1117dfc06034820a415450d3.tar.gz |
Merge pull request #6075 from skv-headless/remove_deprecated_finders
Remove deprecated finders
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index da5f25f3cbc..579644d1119 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -145,10 +145,10 @@ class Project < ActiveRecord::Base def find_with_namespace(id) if id.include?("/") id = id.split("/") - namespace = Namespace.find_by_path(id.first) + namespace = Namespace.find_by(path: id.first) return nil unless namespace - where(namespace_id: namespace.id).find_by_path(id.second) + where(namespace_id: namespace.id).find_by(path: id.second) else where(path: id, namespace_id: nil).last end @@ -296,7 +296,7 @@ class Project < ActiveRecord::Base # Get Team Member record by user id def team_member_by_id(user_id) - users_projects.find_by_user_id(user_id) + users_projects.find_by(user_id: user_id) end def name_with_namespace |