Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index fb5015e..232e8b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 v7.10.0
   - Projects sorting by last commit date
   - Add project search at runner page
+  - Fix GitLab and CI projects collision
 
 v7.9.2
   - [Security] Already existing projects should not be served by shared runners
diff --git a/app/models/project.rb b/app/models/project.rb
index 0d4d2a0..c931c50 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -107,7 +107,7 @@ ls -la
     end
 
     def already_added?(project)
-      where(gitlab_url: project.web_url).any?
+      where(gitlab_id: project.id).any?
     end
 
     def unassigned(runner)