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

Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2014-08-26 13:52:39 +03:00
commit 7840e6314e
23 changed files with 361 additions and 168 deletions

View file

@ -1,6 +1,6 @@
require 'rails_helper'
feature 'Setting management' do
feature 'Setting management', type: :feature do
background { Fabricate(:domain_validation_setting_group) }
scenario 'User changes a setting', js: true do