恢复版本

app/models/repository.rb

@@ -107,7 +107,7 @@ class Repository < ActiveRecord::Base
   def scm
     unless @scm
       @scm = self.scm_adapter.new(url, root_url,
-                                  login, password, path_encoding, project_id)
+                                  login, password, path_encoding)
       if root_url.blank? && @scm.root_url.present?
         update_attribute(:root_url, @scm.root_url)
       end

lib/redmine/scm/adapters/abstract_adapter.rb

@@ -80,7 +80,7 @@ module Redmine
         end
 
         def initialize(url, root_url=nil, login=nil, password=nil,
-                       path_encoding=nil, project_id)
+                       path_encoding=nil)
           @url = url
           @login = login if login && !login.empty?
           @password = (password || "") if @login

lib/redmine/scm/adapters/gitlab_adapter.rb

@@ -13,12 +13,10 @@ module Redmine
           attr_accessor :is_default
         end
 
-        def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id)
+        def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
           super
           @g = Gitlab.client
-          r = Repository.where("url =? and project_id =?", url, project_id).first
-          @project = r.project.gpid
-          # @project = Repository.find_by_url(url).project.gpid
+          @project = Repository.find_by_url(url).project.gpid
           @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
         end