jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/spec
History
Tim 1a1dc7bacc Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	db/schema.rb
 		2015-11-12 15:32:36 +08:00
..
controllers 组织模块功能实现 2015-11-12 09:32:00 +08:00
factories 组织模块功能实现 2015-11-12 09:32:00 +08:00
fixtures 头像上传只允许图片 2015-05-15 16:18:44 +08:00
models 组织模块功能实现 2015-11-12 09:32:00 +08:00
requests Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-11-12 15:32:36 +08:00
support 测试去除spork,有条件可以用zeus 2015-05-14 12:44:30 +08:00
rails_helper.rb 头像上传只允许图片 2015-05-15 16:18:44 +08:00
seeds.rb 头像上传只允许图片 2015-05-15 16:18:44 +08:00
shared_account_spec.rb merge 2015-05-15 13:39:26 +08:00
spec_helper.rb 测试去除spork,有条件可以用zeus 2015-05-14 12:44:30 +08:00