diff --git a/.travis.yml b/.travis.yml index d39733d..d126eee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,3 @@ -dist: trusty -sudo: required -addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - language: ruby rvm: - 2.2.2 @@ -17,7 +8,7 @@ before_script: - cp config/database_example.yml config/database.yml - cp config/secrets_example.yml config/secrets.yml - - mysql -e 'create database IF NOT EXISTS roadmap_test;' -u root --innodb_large_prefix=1 --innodb_file_per_table=1 innodb_file_format=barracuda + - mysql -e 'create database IF NOT EXISTS roadmap_test;' -u root script: - bundle exec rake db:test:prepare diff --git a/db/migrate/20130903123015_create_friendly_id_slugs.rb b/db/migrate/20130903123015_create_friendly_id_slugs.rb index 543f4f3..48ce4de 100644 --- a/db/migrate/20130903123015_create_friendly_id_slugs.rb +++ b/db/migrate/20130903123015_create_friendly_id_slugs.rb @@ -8,7 +8,7 @@ t.datetime :created_at end add_index :friendly_id_slugs, :sluggable_id - add_index :friendly_id_slugs, [:slug, :sluggable_type], :unique => true, :length => {:slug => 191} + add_index :friendly_id_slugs, [:slug, :sluggable_type], :unique => true, :length => {:slug => 191, :sluggable_type => 191} add_index :friendly_id_slugs, :sluggable_type end