update bootstrap, fix travis

glebm · Aug 22, 2013 · b6b003b · b6b003b
1 parent 705169a
commit b6b003b
Show file tree

Hide file tree

Showing 17 changed files with 2,343 additions and 1,566 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,6 @@ gemspec
 
 group :development, :test do
   gem 'capybara', '>= 0.4.0'
-  gem 'sqlite3'
   gem 'rspec', '2.12.0' #, git: 'https://github.com/rspec/rspec'
   gem 'rspec-rails' #, git: 'https://github.com/rspec/rspec-rails'
   gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist'

diff --git a/app/assets/javascripts/rails_email_preview/application.js b/app/assets/javascripts/rails_email_preview/application.js
@@ -0,0 +1 @@
+// =require turbolinks