tests

tweaked Gemfile.lock after double checking merge #6543

Job	Run time
Tests (mysql, rails test test/unit)	16m 45s
Tests (mysql, rails test test/functional)	15m 49s
Tests (mysql, rails test test/integration)	13m 39s
Tests (mysql, rspec spec)	3m 47s
Tests (mysql, rake assets:precompile)	3m 52s
Tests (mysql, rake db:setup)	3m 34s
Tests (mysql, rake db:migrate)	3m 39s
Tests (mysql, rake seek:upgrade)	3m 42s
Tests (sqlite3, rails test test/unit)	16m 32s
	1h 21m 19s

Provide feedback