Tedx2014

.gitignore

@@ -15,7 +15,6 @@ tags
 *~
 rerun.txt
 .bundle
-db/schema.rb
 specifications
 cache
 gems
@@ -31,6 +30,8 @@ public/uploads
 dump.rdb
 zeus.json
 config/database.yml
+config/payway.yml
+*.pem
 images/*
 logfile
 .vagrant/*

Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'rails', '4.0.0'
 
 gem 'rails-observers'
-gem 'debugger'
 gem 'active_model_serializers'
 gem 'bcrypt-ruby'
 gem 'braintree'
@@ -19,46 +18,50 @@ gem 'sidekiq'
 gem 'state_machine'
 gem 'turbolinks'
 gem 'uglifier'
-gem 'compass-rails', github: 'milgner/compass-rails', branch: 'rails4'
-gem 'formtastic', github: 'justinfrench/formtastic', branch: 'rails4beta'
-gem 'responders', github: 'plataformatec/responders'
-gem 'inherited_resources', github: 'josevalim/inherited_resources'
-gem 'ransack', github: 'ernie/ransack', branch: 'rails-4'
-gem 'activeadmin', github: 'akashkamboj/active_admin', branch: 'rails4'
+gem 'devise'
+gem 'compass-rails'
+gem 'formtastic'
+gem 'responders'
+gem 'inherited_resources'
+gem 'ransack', github: 'ernie/ransack'
+gem 'activeadmin', github: 'gregbell/active_admin'
 gem 'jbuilder', '1.0.2'
 gem 'rdoc', '3.12.2'
 gem 'sdoc', '0.3.20'
+gem 'sprockets', '2.11.0' # the activeadmin required devise tried to install v2.12.0 but which was expecting different apis
 gem 'sprockets-rails', :require => 'sprockets/railtie'
 gem 'slim', ">= 1.3.0"
 gem 'sinatra', '>= 1.3.0', :require => nil
-gem 'turbolinks'
 gem "jquery-rails", "2.3.0"
-gem 'launchy'
 gem 'activemerchant-payway'
+gem 'addressable'
+gem 'launchy'
 
 group :staging, :production do
   gem 'unicorn'
 end
 
 group :development do
-  gem 'capistrano'
+  gem 'capistrano', '< 3'
+  gem "capistrano-sidekiq"
   gem 'capistrano-ext'
 end
 
 group :development, :test do
   gem 'awesome_print'
   gem 'coveralls', require: false
-  gem 'faker'
-  gem 'factory_girl_rails'
   gem 'guard-rspec'
-  gem 'pry'
+  gem 'pry-meta'
   gem 'rb-fsevent', '~> 0.9.1'
-  gem 'rspec-rails'
   gem 'konacha'
   gem 'thin'
 end
 
 group :test do
+  gem 'faker'
+  gem 'factory_girl_rails'
+  gem 'rspec', '< 3' # we're using the old syntax
+  gem 'rspec-rails'
   gem 'capybara'
   gem 'poltergeist'
   gem 'database_cleaner'