Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

1 files changed, 3 insertions, 45 deletions

diff --git a/Gemfile b/Gemfile
index 7666805..40030b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,57 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.8'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-
-gem 'json'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'haml-rails',   '~> 0.3.4'
-  gem 'sass-rails',   '~> 3.2.5'
-  gem 'coffee-rails', '~> 3.2.2'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.2.7'
-end
-
-gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 2.0.4'
-gem 'haml', '~> 3.1.7'
-gem 'simple_form'
+eval(File.read(File.dirname(__FILE__) + '/common_dependencies.rb'))
+eval(File.read(File.dirname(__FILE__) + '/ui_dependencies.rb'))
 
 # EITHER fetch all of the leap_web gems in one go
 # gem 'leap_web' 
 # OR use the local versions for development instead:
-gem 'leap_web_core', :path => 'core'
+gem "leap_web_core", :path => 'core'
 gem 'leap_web_users', :path => 'users'
 gem 'leap_web_certs', :path => 'certs'
 gem 'leap_web_help', :path => 'help'
 
-gem 'couchrest_session_store'
-
-
-group :development, :test do
-  gem 'mocha'
-end
-
-# 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'