Will Bradley
d3b8ad7222
Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb
47 lines
873 B
Ruby
47 lines
873 B
Ruby
source 'https://rubygems.org'
|
|
|
|
gem 'rails', '3.2.3'
|
|
|
|
# Bundle edge Rails instead:
|
|
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
|
|
|
gem 'sqlite3'
|
|
|
|
gem 'json'
|
|
|
|
# Gems used only for assets and not required
|
|
# in production environments by default.
|
|
group :assets do
|
|
gem 'sass-rails', '~> 3.2.3'
|
|
gem 'coffee-rails', '~> 3.2.1'
|
|
|
|
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
|
gem 'therubyracer', :platform => :ruby
|
|
|
|
gem 'uglifier', '>= 1.0.3'
|
|
end
|
|
|
|
gem 'jquery-rails'
|
|
|
|
<<<<<<< HEAD
|
|
=======
|
|
gem 'devise'
|
|
|
|
gem "cancan"
|
|
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
# To use ActiveModel has_secure_password
|
|
# gem 'bcrypt-ruby', '~> 3.0.0'
|
|
|
|
# To use Jbuilder templates for JSON
|
|
# gem 'jbuilder'
|
|
|
|
# Use unicorn as the app server
|
|
# gem 'unicorn'
|
|
|
|
# Deploy with Capistrano
|
|
# gem 'capistrano'
|
|
|
|
# To use debugger
|
|
# gem 'ruby-debug'
|