Merge pull request #22 from mo-nathan/master

Update to ruby 2.1.5 with a bundle update
MushroomObserver · Jan 2, 2015 · df10b51 · df10b51
2 parents df93db7 + 2963694
commit df10b51
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.3
+2.1.5
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,39 +2,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.20)
-      actionpack (= 3.2.20)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.20)
-      activesupport (= 3.2.20)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
-    activesupport (3.2.20)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     blankslate (3.1.3)
-    browser (0.7.2)
+    browser (0.8.0)
     builder (3.0.4)
     byebug (3.5.1)
       columnize (~> 0.8)
@@ -47,7 +47,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -63,7 +63,7 @@ GEM
     execjs (2.2.2)
     fakeweb (1.3.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     journey (1.0.4)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
@@ -76,12 +76,12 @@ GEM
     mime-types (1.25.1)
     multi_json (1.10.1)
     mysql2 (0.3.17)
-    netrc (0.8.0)
-    parser (2.2.0.pre.7)
+    netrc (0.10.2)
+    parser (2.2.0.1)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     polyglot (0.3.5)
-    power_assert (0.2.0)
+    power_assert (0.2.2)
     powerpack (0.0.9)
     rack (1.4.5)
     rack-cache (1.2)
@@ -90,38 +90,38 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.20)
-      actionmailer (= 3.2.20)
-      actionpack (= 3.2.20)
-      activerecord (= 3.2.20)
-      activeresource (= 3.2.20)
-      activesupport (= 3.2.20)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.20)
-    railties (3.2.20)
-      actionpack (= 3.2.20)
-      activesupport (= 3.2.20)
+      railties (= 3.2.21)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rainbow (2.0.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rtf (0.3.3)
-    rubocop (0.27.1)
+    rubocop (0.28.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
-    sass (3.4.8)
+    ruby-progressbar (1.7.1)
+    sass (3.4.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -139,7 +139,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    test-unit (3.0.7)
+    test-unit (3.0.9)
       power_assert
     thor (0.19.1)
     tilt (1.4.1)
@@ -148,7 +148,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.42)
-    uglifier (2.5.3)
+    uglifier (2.6.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.3)