Copy Gemfile* from master

2 files changed, 31 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index fbf6232..a34b0a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,12 @@ gem 'rails', '4.0.2'
 # bcrypt is used for password digesting
 gem 'bcrypt-ruby', '3.1.2'
 
+gem 'httparty'
+
+gem 'simple_captcha2', require: 'simple_captcha'
+
+#gem 'rmagick'
+
 group :development, :test do
 	# Use sqlite3 as the database for Active Record
 	gem 'sqlite3'
@@ -41,6 +47,9 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
+# Asynchronously handle longer or delayed tasks
+gem 'delayed_job'
+
 group :doc do
 	# bundle exec rake doc:rails generates the API under doc/api.
 	gem 'sdoc', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7899a93..51e29e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.15)
+    atomic (1.1.16)
     bcrypt-ruby (3.1.2)
     bootstrap-sass (3.1.1.0)
       sass (~> 3.2)
@@ -38,9 +38,14 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
+    httparty (0.13.0)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     i18n (0.6.9)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
@@ -55,7 +60,8 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.9.2)
+    multi_xml (0.5.5)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -73,18 +79,21 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
-    sass (3.2.14)
-    sass-rails (4.0.1)
+    sass (3.2.18)
+    sass-rails (4.0.2)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0.0)
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
+    simple_captcha2 (0.2.1)
+      rails (>= 3.1)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -98,8 +107,8 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
-    thread_safe (0.2.0)
+    thor (0.19.1)
+    thread_safe (0.3.1)
       atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -107,8 +116,8 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (2.2.1)
       coffee-rails
-    tzinfo (0.3.38)
-    uglifier (2.4.0)
+    tzinfo (0.3.39)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -119,11 +128,14 @@ DEPENDENCIES
   bcrypt-ruby (= 3.1.2)
   bootstrap-sass
   coffee-rails (~> 4.0.0)
+  delayed_job
+  httparty
   jbuilder (~> 1.2)
   jquery-rails
   rails (= 4.0.2)
   sass-rails (~> 4.0.0)
   sdoc
+  simple_captcha2
   sqlite3
   therubyracer
   turbolinks