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

@ -16,6 +16,11 @@ RSpec::Core::RakeTask.new('test:other') do |t|
t.rspec_opts = '--tag ~epp'
end
desc 'Run all but EPP specs'
RSpec::Core::RakeTask.new('test:all_but_features') do |t|
t.rspec_opts = '--tag ~feature'
end
Rake::Task[:default].prerequisites.clear
task default: :test