socialforge/spec
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-01-14 15:59:50 +08:00
..
controllers Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 15:59:50 +08:00
factories Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 15:59:50 +08:00
fixtures 头像上传只允许图片 2015-05-15 16:18:44 +08:00
models Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 15:59:50 +08:00
requests 新增gitlab adapter用于适配gitlab命令 2015-08-01 18:48:55 +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