jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjq_new_course' into develop

This commit is contained in:
huang 2015-12-21 14:37:04 +08:00
parent c381ce177f 1a549eda46
commit 3e6000a7a3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/repository.rb
View File

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

2
lib/redmine/scm/adapters/abstract_adapter.rb
View File

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

6
lib/redmine/scm/adapters/gitlab_adapter.rb
View File

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