Merge pull request #131 from HaughtCodeworks/master

Bring V2.0 version from fork to main repository

Author: mghaught

.DS_Store

@@ -5,3 +5,6 @@
 /tmp
 
 .env
+scratch.md
+.ruby-version
+.ruby-gemset

.gitignore

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.4.4
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

.ruby-version

@@ -1,35 +1,41 @@
 source 'https://rubygems.org'
-ruby '2.3.0'
+ruby '2.4.4'
 
-gem 'rails', '4.2.5'
-gem 'puma', '~> 2.13'
+gem 'rails', '5.1.4'
+gem 'puma', '~> 3.12.0'
 
 gem 'pg'
 
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
-gem 'jquery-datatables-rails', github: "rweng/jquery-datatables-rails"
+gem 'jquery-datatables-rails'
+gem 'underscore-rails'
 gem 'uglifier', '>= 1.3.0'
-gem 'sass-rails', '~> 4.0.1'
+gem 'sass-rails', '~> 5.0.4'
 gem 'haml', '~> 4.0.4'
-gem 'bootstrap-sass', '~> 3.0.2.1'
+gem 'bootstrap-sass', '~> 3.3.6'
+gem 'rails-assets-momentjs', source: 'https://rails-assets.org'
+gem 'selectize-rails'
 
+gem 'devise', '~> 4.4.3'
 gem 'omniauth-github'
 gem 'omniauth-twitter'
 
 gem 'chartkick'
 gem 'groupdate'
 gem 'country_select', '~> 1.3.1'
-gem 'redcarpet', '~> 3.0.0'
+gem 'redcarpet', '~> 3.4.0'
 gem 'coderay', '~> 1.0'
-gem 'bootstrap-multiselect-rails', '0.0.4'
-gem 'active_model_serializers', '~> 0.8.1'
-gem 'draper'
-gem 'simple_form', '3.1.0'
-
-gem 'zeroclipboard-rails'
-
-gem 'responders', '~> 2.0'
+gem 'bootstrap-multiselect-rails', '~> 0.9.9'
+gem 'active_model_serializers', '~> 0.10.0'
+gem 'draper', '~> 3.0.1'
+gem 'simple_form', '~> 3.5.0'
+gem 'responders', '~> 2.4.0'
+gem 'pundit'
+gem 'faker'
+gem 'actionview-encoded_mail_to'
+gem 'nokogiri', '~> 1.8.1'
+gem 'erubis'
 
 group :production do
   gem 'rails_12factor'
@@ -42,20 +48,17 @@ group :development do
   gem 'binding_of_caller'
   gem 'foreman'
   gem 'launchy'
-  gem 'pry'
-  gem 'pry-rails'
-  gem 'quiet_assets'
   gem 'rack-mini-profiler'
+  gem 'html2haml', '~> 2.2.0'
   gem 'haml-rails'
-  gem "spring-commands-rspec", require: false
-
+  gem 'spring-commands-rspec', require: false
   gem 'web-console', '~> 2.0'
 end
 
 group :development, :test do
-  gem 'capybara', '>= 2.2'
-  gem 'capybara-webkit', '~> 1.6.0' # Requires local installation of QT (`brew install qt`)
-  gem 'database_cleaner'
+  gem 'capybara'
+  gem 'capybara-webkit' # Local QT install req'd (`brew install qt`)
+  gem 'database_cleaner', '~> 1.6.0'
   gem 'dotenv-rails'
   gem 'factory_girl_rails'
   gem 'growl'
@@ -64,6 +67,10 @@ group :development, :test do
   gem 'guard-livereload', '~> 2.1.1'
   gem 'rspec'
   gem 'rspec-rails'
+  gem 'rails-controller-testing'
   gem 'timecop'
   gem 'spring'
+  gem 'pry-rails'
+  gem 'pry-rescue'
+  gem 'pry-remote'
 end