#2 Best in place working on settings page. Some other styling changes. The form to create organization/coach doesn't work.

.gitignore

@@ -30,4 +30,4 @@
 /config/settings.yml
 
 # Ignore DB NAME GOES HERE file
-"DB NAME GOES HERE"
+"DB NAME GOES HERE"

Capfile

@@ -1,4 +1,7 @@
 load 'deploy'
 # Uncomment if you are using Rails' asset pipeline
 load 'deploy/assets'
-load 'config/deploy' # remove this line to skip loading any of the default tasks
+load 'config/deploy' # remove this line to skip loading any of the default tasks
+
+require 'capistrano/sidekiq'
+set :pty, false

Gemfile

@@ -3,72 +3,67 @@
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.13'
 
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0.0'
+gem 'sass-rails', '5.0.3'
 
 # Use Materialize for css
 gem 'materialize-sass', github: 'mkhairi/materialize-sass'
 
 # Use Font Awesome for icons
-gem 'font-awesome-sass'
+gem 'font-awesome-sass', '4.3.2.1'
 
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '2.7.1'
 
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '4.0.1'
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '3.1.2'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '1.5.3'
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false
 end
 
 # Use a gem for handling pagination
-gem 'will_paginate'
+gem 'will_paginate', '3.0.7'
 
 # Use a gem for handling date validation
-gem 'validates_timeliness'
+gem 'validates_timeliness', '3.0.14'
 
 # Use simple_form to clean up form views
-gem 'simple_form'
+gem 'simple_form', '3.1.0'
 
-gem "nested_form"
+gem "nested_form", '0.3.2'
 
 # Use geocoder to get latitude and longitude data
-gem 'geocoder'
+gem 'geocoder', '1.2.8'
 
 # Use gem to handle Canadian postal codes too
 # gem 'validates_as_postal_code'
 # gem 'going_postal'
 
 # Use ActiveModel has_secure_password
-gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '3.1.10'
 
 # Date Picker for simple form
-gem 'momentjs-rails', '~> 2.9',  :github => 'derekprior/momentjs-rails'
-gem 'datetimepicker-rails', github: 'zpaulovics/datetimepicker-rails', branch: 'master', submodules: true
+gem 'momentjs-rails', '2.10.3',  :github => 'derekprior/momentjs-rails'
+gem 'datetimepicker-rails', '4.7.16', github: 'zpaulovics/datetimepicker-rails', branch: 'master', submodules: true
 
 # Use jquery for datepicker
-gem 'jquery-ui-rails'
+gem 'jquery-ui-rails', '5.0.5'
 
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
 #date converting
-gem 'chronic'
+gem 'chronic', '0.10.2'
 gem 'time_date_helpers', '0.0.2'
 
-gem 'cancancan'
-gem 'rolify'
 gem 'best_in_place', github: 'cmu-is-projects/best_in_place'
 
 # Additional gems that are very useful in Rails development
@@ -82,6 +77,7 @@ group :development do
   gem 'hirb', '0.7.2'
   gem 'faker', '1.4.3'
   gem 'capistrano', '2.13.5'
+  gem 'letter_opener'
 end
 
 # Gems used only in testing
@@ -99,6 +95,27 @@ group :test do
   gem 'capybara'
 end
 
+# Database gems
+<<<<<<< HEAD
+#gem 'pg' # for everything...
+=======
+gem 'pg', '0.18.2' # for everything...
+# group :development, :test do
+    gem 'sqlite3'
+# end
 # group :production do
 #   gem 'pg'
 # end
+
+# Gem made to use high charts easily
+gem 'lazy_high_charts', '1.5.4'
+
+# Use Sidekiq for async rake task processing
+gem 'sidekiq', '3.3.4'
+
+
+gem 'pg_search', '1.0.3'
+
+# Capistrano support for Sidekiq
+gem 'capistrano-sidekiq', '0.5.3', github: 'seuros/capistrano-sidekiq'
+