升级至 rails4
去掉 Gemfile.lock
ignore lock
Merge branch 'rails4'