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

Conflicts:
	app/assets/stylesheets/shared/general.sass
This commit is contained in:
Martin Lensment 2015-04-21 13:23:50 +03:00
commit dbbc6b3bff
58 changed files with 552 additions and 322 deletions

View file

@ -30,10 +30,12 @@ gem 'turbolinks', '~> 2.5.3' # faster page load
gem 'jquery-rails', '~> 4.0.3' # jquery
gem 'selectize-rails', '~> 0.11.2' # include selectize.js for select
gem 'therubyracer', platforms: :ruby
gem 'jquery-validation-rails', '~> 1.13.1' # validate on client side
# view helpers
gem 'kaminari', '~> 0.16.3' # pagination
gem 'nprogress-rails', '~> 0.1.6.5' # visual loader
gem 'html5_validators', '~> 1.1.3' # model requements now automatically on html form
# rights
gem 'devise', '~> 3.4.1' # authenitcation