daiao 77f58d76a5 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop ... # Conflicts: # db/schema.rb		2017-02-19 09:21:55 +08:00
..
controllers	Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop	2017-02-19 09:21:55 +08:00
factories	Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop	2017-02-19 09:21:55 +08:00
fixtures	头像上传只允许图片	2015-05-15 16:18:44 +08:00
models	Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop	2017-02-19 09:21:55 +08:00
requests	issue 11269 性能问题，从12秒到6秒多，还有优化空间	2017-01-18 00:17:41 +08:00
support	代码重置	2016-03-11 10:18:10 +08:00
utils	.	2016-11-26 17:49:36 +08:00
rails_helper.rb	issue 11269 性能问题，从12秒到6秒多，还有优化空间	2017-01-18 00:17:41 +08:00
seeds.rb	代码重置	2016-03-11 10:18:10 +08:00
shared_account_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
spec_helper.rb	代码重置	2016-03-11 10:18:10 +08:00