diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index a89f224b6..7588eef21 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -96,7 +96,7 @@ class RepositoriesController < ApplicationController # add by nwb # 增加对gitlab版本库的支持 attrs = pickup_extra_info - @repository = Repository.factory(params[:repository_scm]) + @repository = Repository.factory('Git') @repository.safe_attributes = params[:repository] if attrs[:attrs_extra].keys.any? @repository.merge_extra_info(attrs[:attrs_extra]) diff --git a/app/models/project.rb b/app/models/project.rb index 698b1f26a..12c932dd8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -41,7 +41,7 @@ class Project < ActiveRecord::Base has_many :principals, :through => :member_principals, :source => :principal has_many :enabled_modules, :dependent => :delete_all has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position" - has_many :issues, :dependent => :destroy, :include => [:status, :tracker] , :order => "id ASC" + has_many :issues, :dependent => :destroy, :include => [:status, :tracker] has_many :issue_changes, :through => :issues, :source => :journals has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC" has_many :time_entries, :dependent => :delete_all