Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq ... Conflicts: public/stylesheets/org.css		2015-12-24 10:40:00 +08:00
..
controllers	组织界面增加分栏	2015-12-04 17:34:48 +08:00
factories	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
fixtures	头像上传只允许图片	2015-05-15 16:18:44 +08:00
models	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +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