Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-12-01 11:29:59 +02:00
commit 907ef1edf7
33 changed files with 629 additions and 288 deletions

View file

@ -76,6 +76,9 @@ gem 'delayed_job_active_record', '~> 4.0.2'
gem 'daemons'
group :development, :test do
# for inserting dummy data
gem 'activerecord-import', '~> 0.6.0'
gem 'capybara', '~> 2.4.1'
# For feature testing
# gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks