update gemfile

21bec5f0 · tady · 89ea2d01 · 21bec5f0
Commit 21bec5f0 authored Apr 20, 2014 by tady
Show whitespace changes
Inline Side-by-side

Showing with 85 additions and 81 deletions

Gemfile.lock
+85 -81

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,43 +10,42 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.0.3)
+    actionmailer (4.1.0)
-      actionpack (= 4.0.3)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
      mail (~> 2.5.4)
-    actionpack (4.0.3)
+    actionpack (4.1.0)
-      activesupport (= 4.0.3)
+      actionview (= 4.1.0)
-      builder (~> 3.1.0)
+      activesupport (= 4.1.0)
-      erubis (~> 2.7.0)
      rack (~> 1.5.2)
      rack-test (~> 0.6.2)
-    activemodel (4.0.3)
+    actionview (4.1.0)
-      activesupport (= 4.0.3)
+      activesupport (= 4.1.0)
-      builder (~> 3.1.0)
+      builder (~> 3.1)
-    activerecord (4.0.3)
+      erubis (~> 2.7.0)
-      activemodel (= 4.0.3)
+    activemodel (4.1.0)
-      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.1.0)
-      activesupport (= 4.0.3)
+      builder (~> 3.1)
-      arel (~> 4.0.0)
+    activerecord (4.1.0)
-    activerecord-deprecated_finders (1.0.3)
+      activemodel (= 4.1.0)
-    activesupport (4.0.3)
+      activesupport (= 4.1.0)
-      i18n (~> 0.6, >= 0.6.4)
+      arel (~> 5.0.0)
-      minitest (~> 4.2)
+    activesupport (4.1.0)
-      multi_json (~> 1.3)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
-    addressable (2.3.5)
+    addressable (2.3.6)
-    ancestry (2.0.0)
+    ancestry (2.1.0)
      activerecord (>= 3.0.0)
-    arel (4.0.2)
+    arel (5.0.1.20140414130214)
    ast (1.1.0)
-    atomic (1.1.15)
+    aws-sdk (1.38.0)
-    aws-sdk (1.36.1)
      json (~> 1.4)
      nokogiri (>= 1.4.4)
      uuidtools (~> 2.1)
    bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
    better_errors (1.1.0)
      coderay (>= 1.0.0)
      erubis (>= 2.6.6)
@@ -54,8 +53,8 @@ GEM
      debug_inspector (>= 0.0.1)
    breadcrumble (4.0.0)
      rails (>= 4.0.0)
-    builder (3.1.4)
+    builder (3.2.2)
-    capistrano (3.1.0)
+    capistrano (3.2.0)
      i18n
      rake (>= 10.0.0)
      sshkit (~> 1.3)
@@ -99,15 +98,15 @@ GEM
    daemons (1.1.9)
    database_rewinder (0.0.3)
    debug_inspector (0.0.2)
-    devise (3.2.3)
+    devise (3.2.4)
-      bcrypt-ruby (~> 3.0)
+      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 3.2.6, < 5)
      thread_safe (~> 0.1)
      warden (~> 1.2.3)
    diff-lcs (1.2.5)
    docile (1.1.3)
-    domain_name (0.5.16)
+    domain_name (0.5.18)
      unf (>= 0.0.5, < 1.0.0)
    draper (1.3.0)
      actionpack (>= 3.0)
@@ -128,25 +127,25 @@ GEM
    formatador (0.2.4)
    gherkin (2.12.2)
      multi_json (~> 1.3)
-    github-markdown (0.6.4)
+    github-markdown (0.6.5)
    gmail_xoauth (0.4.1)
      oauth (>= 0.3.6)
-    guard (2.5.1)
+    guard (2.6.0)
      formatador (>= 0.2.4)
-      listen (~> 2.6)
+      listen (~> 2.7)
      lumberjack (~> 1.0)
      pry (>= 0.9.12)
      thor (>= 0.18.1)
    guard-rspec (4.2.8)
      guard (~> 2.1)
      rspec (>= 2.14, < 4.0)
-    guard-rubocop (1.0.2)
+    guard-rubocop (1.1.0)
      guard (~> 2.0)
-      rubocop (~> 0.10)
+      rubocop (~> 0.20)
    guard-teaspoon (0.0.4)
      guard (>= 1.6.1)
      teaspoon (>= 0.5.3)
-    hashie (2.0.5)
+    hashie (2.1.1)
    hike (1.2.3)
    htmlentities (4.3.1)
    http-cookie (1.0.2)
@@ -155,9 +154,9 @@ GEM
    i18n_generators (1.2.1)
      mechanize
      rails (>= 3.0.0)
-    jbuilder (2.0.4)
+    jbuilder (2.0.6)
-      activesupport (>= 3.0.0)
+      activesupport (>= 3.0.0, < 5)
-      multi_json (>= 1.2.0)
+      multi_json (~> 1.2)
    jquery-rails (3.1.0)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
@@ -167,12 +166,12 @@ GEM
    launchy (2.4.2)
      addressable (~> 2.3)
    libv8 (3.16.14.3)
-    listen (2.7.0)
+    listen (2.7.1)
      celluloid (>= 0.15.2)
      celluloid-io (>= 0.15.0)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.5)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
@@ -187,15 +186,15 @@ GEM
      webrobots (>= 0.0.9, < 0.2)
    method_source (0.8.2)
    mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
-    minitest (4.7.5)
+    minitest (5.3.3)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
    multi_xml (0.5.5)
    multipart-post (2.0.0)
    mysql2 (0.3.15)
    net-http-digest_auth (1.4)
    net-http-persistent (2.9.4)
-    net-scp (1.1.2)
+    net-scp (1.2.0)
      net-ssh (>= 2.6.5)
    net-ssh (2.8.0)
    newrelic_rpm (3.7.3.204)
@@ -213,19 +212,19 @@ GEM
    omniauth (1.2.1)
      hashie (>= 1.2, < 3)
      rack (~> 1.0)
-    omniauth-google-oauth2 (0.2.2)
+    omniauth-google-oauth2 (0.2.3)
      omniauth (~> 1.0)
-      omniauth-oauth2
+      omniauth-oauth2 (~> 1.1)
    omniauth-oauth2 (1.1.2)
      faraday (>= 0.8, < 0.10)
      multi_json (~> 1.3)
      oauth2 (~> 0.9.3)
      omniauth (~> 1.2)
    orm_adapter (0.5.0)
-    paper_trail (3.0.0)
+    paper_trail (3.0.1)
      activerecord (>= 3.0, < 5.0)
      activesupport (>= 3.0, < 5.0)
-    parser (2.1.7)
+    parser (2.1.8)
      ast (~> 1.1)
      slop (~> 3.4, >= 3.4.5)
    poltergeist (1.5.0)
@@ -235,7 +234,7 @@ GEM
      websocket-driver (>= 0.2.0)
    polyglot (0.3.4)
    powerpack (0.0.9)
-    premailer (1.8.1)
+    premailer (1.8.2)
      css_parser (>= 1.3.5)
      htmlentities (>= 4.0.0)
    pry (0.9.12.6)
@@ -247,21 +246,23 @@ GEM
    rack (1.5.2)
    rack-test (0.6.2)
      rack (>= 1.0)
-    rails (4.0.3)
+    rails (4.1.0)
-      actionmailer (= 4.0.3)
+      actionmailer (= 4.1.0)
-      actionpack (= 4.0.3)
+      actionpack (= 4.1.0)
-      activerecord (= 4.0.3)
+      actionview (= 4.1.0)
-      activesupport (= 4.0.3)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.1.0)
-      sprockets-rails (~> 2.0.0)
+      sprockets-rails (~> 2.0)
-    railties (4.0.3)
+    railties (4.1.0)
-      actionpack (= 4.0.3)
+      actionpack (= 4.1.0)
-      activesupport (= 4.0.3)
+      activesupport (= 4.1.0)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.0.0)
-    rake (10.1.1)
+    rake (10.3.1)
    rb-fsevent (0.9.4)
    rb-inotify (0.9.3)
      ffi (>= 0.5.0)
@@ -279,7 +280,7 @@ GEM
    rspec-expectations (2.14.5)
      diff-lcs (>= 1.1.3, < 2.0)
    rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rspec-rails (2.14.2)
      actionpack (>= 3.0)
      activemodel (>= 3.0)
      activesupport (>= 3.0)
@@ -287,16 +288,19 @@ GEM
      rspec-core (~> 2.14.0)
      rspec-expectations (~> 2.14.0)
      rspec-mocks (~> 2.14.0)
-    rubocop (0.18.1)
+    rubocop (0.20.1)
      json (>= 1.7.7, < 2)
-      parser (~> 2.1.3)
+      parser (~> 2.1.7)
      powerpack (~> 0.0.6)
      rainbow (>= 1.99.1, < 3.0)
-    sass (3.3.2)
+      ruby-progressbar (~> 1.4)
-    sass-rails (4.0.1)
+    ruby-progressbar (1.4.2)
+    sass (3.2.19)
+    sass-rails (4.0.3)
      railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
+      sass (~> 3.2.0)
-      sprockets-rails (~> 2.0.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
    sdoc (0.4.0)
      json (~> 1.8)
      rdoc (~> 4.0, < 5.0)
@@ -315,15 +319,15 @@ GEM
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      sprockets (~> 2.8)
-    sshkit (1.3.0)
+    sshkit (1.4.0)
      net-scp (>= 1.1.2)
-      net-ssh
+      net-ssh (>= 2.8.0)
      term-ansicolor
-    teaspoon (0.7.9)
+    teaspoon (0.8.0)
      railties (>= 3.2.5, < 5)
    temple (0.6.7)
    term-ansicolor (1.3.0)
@@ -335,23 +339,23 @@ GEM
      daemons (>= 1.0.9)
      eventmachine (>= 1.0.0)
      rack (>= 1.0.0)
-    thor (0.18.1)
+    thor (0.19.1)
-    thread_safe (0.2.0)
+    thread_safe (0.3.3)
-      atomic (>= 1.1.7, < 2)
    tilt (1.4.1)
    timers (1.1.0)
-    tins (1.0.0)
+    tins (1.1.0)
    treetop (1.4.15)
      polyglot
      polyglot (>= 0.3.1)
    turnip (1.2.1)
      gherkin (>= 2.5)
      rspec (>= 2.0, < 4.0)
-    tzinfo (0.3.39)
+    tzinfo (1.1.0)
-    uglifier (2.4.0)
+      thread_safe (~> 0.1)
+    uglifier (2.5.0)
      execjs (>= 0.3.0)
      json (>= 1.8.0)
-    unf (0.1.3)
+    unf (0.1.4)
      unf_ext
    unf_ext (0.0.6)
    uuidtools (2.1.4)