From 13a3725b06fa6835795bc8745b138085ea2da99b Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 16 Jul 2014 09:28:12 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock                               | 6 ------
 app/controllers/repositories_controller.rb | 2 +-
 app/models/project.rb                      | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fe06a5e46..68c4f3587 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,6 @@ GEM
     hike (1.2.3)
     htmlentities (4.3.2)
     i18n (0.6.1)
-    iconv (1.0.4)
     journey (1.0.4)
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
@@ -235,8 +234,6 @@ GEM
     win32console (1.3.2-x86-mingw32)
     xpath (1.0.0)
       nokogiri (~> 1.3)
-    zip-zip (0.3)
-      rubyzip (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -257,7 +254,6 @@ DEPENDENCIES
   guard-test (~> 1.0.0)
   htmlentities
   i18n (~> 0.6.0)
-  iconv
   jquery-rails (~> 2.0.2)
   kaminari
   mocha (~> 0.13.3)
@@ -274,11 +270,9 @@ DEPENDENCIES
   rmagick (>= 2.0.0)
   ruby-openid (~> 2.1.4)
   ruby-prof
-  rubyzip
   sass-rails (~> 3.2.3)
   seems_rateable!
   shoulda (> 3.3.2)
   spork-testunit
   therubyracer
   uglifier (>= 1.0.3)
-  zip-zip
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