Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:mindpin/web-url-collector
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:mindpin/web-url-collector
done migrating
changed Gemfile
added secrets.yml to commit list and fixed a bug in auth_controller
update rails config
Merge branch 'feature/migrate_to_rails'
merge
add deploy.rb
update: 添加微博验证信息
Merge branch 'feature/migrate_to_rails' into develop
Merge branch 'master' into develop