Change rails version in gemfile
Change sass-rails version in gemfile
Ran `bundle update`
Merge branch 'upgrade-rails'