Merge branch 'release/1.2.0'

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.0
+-----
+* Removed nokogiri
+* Updated gems
+
 1.1.2
 -----
 * Updated gems

Gemfile

@@ -28,7 +28,6 @@ gem 'pg'
 gem 'haml'
 # gem 'http_accept_language'
 gem 'jquery-rails'
-gem 'nokogiri'
 # gem 'resque', require: 'resque/server' # Resque web interface
 
 # Assets

Gemfile.lock

@@ -38,7 +38,7 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     arel (4.0.0)
-    atomic (1.1.10)
+    atomic (1.1.12)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -76,7 +76,7 @@ GEM
       thor
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    database_cleaner (1.0.1)
+    database_cleaner (1.1.1)
     debug_inspector (0.0.2)
     debugger (1.6.1)
       columnize (>= 0.3.1)
@@ -98,7 +98,7 @@ GEM
     factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    faker (1.1.2)
+    faker (1.2.0)
       i18n (~> 0.5)
     ffi (1.9.0)
     haml (4.0.3)
@@ -132,11 +132,11 @@ GEM
       callsite
       rack-contrib
       railties
-    method_source (0.8.1)
+    method_source (0.8.2)
     mime-types (1.23)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.7.7)
+    multi_json (1.7.8)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     pg (0.16.0)
@@ -184,7 +184,7 @@ GEM
     rspec-core (2.14.4)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.14.2)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -194,7 +194,7 @@ GEM
       rspec-mocks (~> 2.14.0)
     rubyzip (0.9.9)
     safe_yaml (0.9.4)
-    sass (3.2.9)
+    sass (3.2.10)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -270,7 +270,6 @@ DEPENDENCIES
   launchy
   less-rails
   meta_request
-  nokogiri
   pg
   pry
   pry-rails

VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0