Merge branch 'master' of github.com:RubySchools/social_network

.gitignore

@@ -6,7 +6,7 @@
 
 # Ignore bundler config
 /.bundle
-
+*~
 # Ignore the default SQLite database.
 /db/*.sqlite3
 

Gemfile

@@ -5,13 +5,14 @@ gem 'rails'
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
+#gem 'sqlite3'
 gem 'sorcery'
-gem 'therubyracer'
+gem 'therubyracer', :platforms => [:ruby]
 gem 'sorcery'
 gem 'carrierwave'
 gem 'rmagick'
-
+gem 'thin'
+gem 'eventmachine', '~> 1.0.0.beta', :platforms => [:mswin, :mingw]
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
@@ -41,3 +42,8 @@ group :development do
   gem 'thin'
   gem 'daemons'
 end
+
+group :test do
+  gem 'cucumber'
+  gem 'rspec'
+end

Gemfile.lock

@@ -31,6 +31,7 @@ GEM
     addressable (2.2.6)
     arel (3.0.0)
     bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-x86-mingw32)
     builder (3.0.0)
     cancan (1.6.7)
     carrierwave (0.5.8)
@@ -44,7 +45,7 @@ GEM
     coffee-script-source (1.2.0)
     daemons (1.1.6)
     erubis (2.7.0)
-    eventmachine (0.12.10)
+    eventmachine (1.0.0.beta.4.1-x86-mingw32)
     execjs (1.3.0)
       multi_json (~> 1.0)
     faraday (0.7.6)
@@ -71,6 +72,7 @@ GEM
       faraday (~> 0.7)
       multi_json (~> 1.0)
     pg (0.12.2)
+    pg (0.12.2-x86-mingw32)
     polyglot (0.3.3)
     rack (1.4.0)
     rack-cache (1.1)
@@ -113,7 +115,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
     therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thin (1.3.1)
@@ -132,19 +133,20 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   cancan
   carrierwave
   coffee-rails (~> 3.2.1)
   daemons
+  eventmachine (~> 1.0.0.beta)
   jquery-rails
   pg
   rails
   rmagick
   sass-rails (~> 3.2.3)
   sorcery
-  sqlite3
   therubyracer
   thin
   uglifier (>= 1.0.3)

Procfile

@@ -0,0 +1 @@
+web: bundle exec rails server thin -p $PORT