Merge branch 'master' of github.com:ZeusWPI/Tab

This commit is contained in:
Tom Naessens 2015-09-08 15:12:40 +02:00
commit 0c9b9b08b1
2 changed files with 9 additions and 0 deletions

View file

@ -21,6 +21,12 @@ gem 'omniauth-oauth2'
# Authorisation # Authorisation
gem 'cancancan' gem 'cancancan'
# Pure for css
gem 'purecss-rails'
# Use datatables
gem 'jquery-datatables-rails', '~> 3.3.0'
# Use jquery as the JavaScript library # Use jquery as the JavaScript library
gem 'jquery-rails' gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks

View file

@ -131,6 +131,8 @@ GEM
oauth2 (~> 1.0) oauth2 (~> 1.0)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
purecss-rails (0.6.0)
railties (>= 3.2.6, < 5)
rack (1.6.4) rack (1.6.4)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
@ -238,6 +240,7 @@ DEPENDENCIES
jquery-rails jquery-rails
mysql2 mysql2
omniauth-oauth2 omniauth-oauth2
purecss-rails
rails (= 4.2.4) rails (= 4.2.4)
rspec-rails rspec-rails
sass-rails (~> 5.0) sass-rails (~> 5.0)