Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile

This commit is contained in:
Xavier J 2015-08-12 10:10:26 +02:00
commit a8f9237ec1
2 changed files with 11 additions and 0 deletions

9
.gitignore vendored
View file

@ -15,3 +15,12 @@
/log/*
!/log/.keep
/tmp
# Ignore Intellij files
.idea/
*.iml
*.iws
public/uploads

View file

@ -54,6 +54,8 @@ class ActiveRecord::Base
end
end
SIADETOKEN = :valid_token
include Warden::Test::Helpers
RSpec.configure do |config|