diff --git a/Gemfile.lock b/Gemfile.lock index ce9e31fc8..2c925227c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,10 +43,10 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) - ast (2.1.0) + ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.1.2) + autoprefixer-rails (6.2.3) execjs json biz (1.3.3) @@ -55,7 +55,7 @@ GEM equalizer (~> 0.0.0) memoizable (~> 0.4.0) tzinfo - browser (1.0.1) + browser (1.1.0) buftok (0.2.0) builder (3.2.2) childprocess (0.5.8) @@ -63,9 +63,9 @@ GEM clavius (1.0.1) memoizable (~> 0.4.0) coderay (1.1.0) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs @@ -143,7 +143,7 @@ GEM rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.9) + lumberjack (1.0.10) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -172,9 +172,9 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - omniauth (1.2.2) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) omniauth-google-oauth2 (0.2.10) @@ -240,7 +240,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.4.2) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) ref (2.0.0) @@ -277,14 +277,14 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - spring (1.6.0) + spring (1.6.1) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.0.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.11) test-unit (3.1.5) power_assert @@ -383,4 +383,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.10.6 + 1.11.2