You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange ... Conflicts: Gemfile app/models/user.rb db/schema.rb lib/trustie.rb 解决冲突		10 years ago
..
controllers	添加功能：管理员界面发送系统消息	10 years ago
factories	添加系统消息单独新页面	10 years ago
fixtures	头像上传只允许图片	10 years ago
models	添加功能：管理员界面发送系统消息	10 years ago
requests	新增gitlab adapter用于适配gitlab命令	10 years ago
support	测试去除spork,有条件可以用zeus	10 years ago
rails_helper.rb	头像上传只允许图片	10 years ago
seeds.rb	头像上传只允许图片	10 years ago
shared_account_spec.rb	merge	10 years ago
spec_helper.rb	测试去除spork,有条件可以用zeus	10 years ago