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

BUG修改

This commit is contained in:
nwb 2014-07-16 09:28:12 +08:00
parent 53ff6ea335
commit 13a3725b06
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

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

2
app/controllers/repositories_controller.rb
View File

@ -96,7 +96,7 @@ class RepositoriesController < ApplicationController
# add by nwb # add by nwb
# 增加对gitlab版本库的支持 # 增加对gitlab版本库的支持
attrs = pickup_extra_info attrs = pickup_extra_info
@repository = Repository.factory(params[:repository_scm]) @repository = Repository.factory('Git')
@repository.safe_attributes = params[:repository] @repository.safe_attributes = params[:repository]
if attrs[:attrs_extra].keys.any? if attrs[:attrs_extra].keys.any?
@repository.merge_extra_info(attrs[:attrs_extra]) @repository.merge_extra_info(attrs[:attrs_extra])

2
app/models/project.rb
View File

@ -41,7 +41,7 @@ class Project < ActiveRecord::Base
has_many :principals, :through => :member_principals, :source => :principal has_many :principals, :through => :member_principals, :source => :principal
has_many :enabled_modules, :dependent => :delete_all has_many :enabled_modules, :dependent => :delete_all
has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position" 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 :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 :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
has_many :time_entries, :dependent => :delete_all has_many :time_entries, :dependent => :delete_all