huang 4c61e7490b Merge branch 'develop' into gitlab_guange ... Conflicts: db/schema.rb		2015-10-27 14:42:05 +08:00
..
controllers	简单博客功能	2015-10-24 15:34:43 +08:00
factories	简单博客功能	2015-10-24 15:34:43 +08:00
fixtures	头像上传只允许图片	2015-05-15 16:18:44 +08:00
models	个人主页留言动态的实现	2015-10-13 16:51:44 +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