will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn

Browse Source
This commit is contained in:
Will Bradley 2013-08-26 15:39:18 -07:00
commit 9e4b79a353
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -40,7 +40,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
# gem 'capistrano' # gem 'capistrano'
# To use debugger # To use debugger
gem 'debugger' #gem 'debugger'
#gem "paperclip", "~> 3.0" #gem "paperclip", "~> 3.0"
gem 'gravtastic' gem 'gravtastic'

8
Gemfile.lock
View File

@ -39,13 +39,6 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.3.3) coffee-script-source (1.3.3)
columnize (0.3.6)
debugger (1.6.0)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.2.1)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.2)
devise (2.1.1) devise (2.1.1)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
@ -127,7 +120,6 @@ DEPENDENCIES
bcrypt-ruby (~> 3.0.0) bcrypt-ruby (~> 3.0.0)
cancan cancan
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
debugger
devise devise
gravtastic gravtastic
jquery-rails jquery-rails

1
db/schema.rb
View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead # This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to # of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition. # incrementally modify your database, and then regenerate this schema definition.