diff --git a/Gemfile.lock b/Gemfile.lock index cb983be4a58..8d2536edea7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,52 +8,12 @@ GIT GIT remote: git://github.com/sporkrb/spork-rails.git - revision: 3224f84d8c31fcb0894e9a43f6c3ac67e3aa0d71 + revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e specs: - spork-rails (3.2.1) + spork-rails (4.0.0) rails (>= 3.0.0, < 5) spork (>= 1.0rc0) -GIT - remote: https://github.com/CodeMonkeySteve/fast_xor.git - revision: 85b79ec6d116f9680f23bd2c5c8c2c2039d477d8 - specs: - fast_xor (1.1.2) - rake - rake-compiler - -GIT - remote: https://github.com/MiniProfiler/rack-mini-profiler.git - revision: e08b751091a41f0066a1b28bd4e2b9b3480a1c1b - specs: - rack-mini-profiler (0.1.31) - rack (>= 1.1.3) - -GIT - remote: https://github.com/SamSaffron/annotate_models.git - revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2 - specs: - annotate (2.6.0.beta1) - activerecord (>= 2.3.0) - rake (>= 0.8.7) - -GIT - remote: https://github.com/SamSaffron/flamegraph.git - revision: 07bd0ffdfd352e2fceb4edaf281990ba99156355 - specs: - flamegraph (0.0.5) - fast_stack - -GIT - remote: https://github.com/SamSaffron/message_bus - revision: c357cbfea34eec3cca8f00754eb9d5bd2be98594 - specs: - message_bus (0.0.2) - eventmachine - rack (>= 1.1.3) - redis - thin - GIT remote: https://github.com/SamSaffron/sprockets.git revision: bacf2ec4d4d10cd8d1ab25a6360740314c512237 @@ -67,7 +27,7 @@ GIT GIT remote: https://github.com/SamSaffron/vestal_versions - revision: 671833227aa47f16e9c907fe7b2870be3743ac00 + revision: 007b30a5274db7db55da745a4482243559247782 specs: vestal_versions (1.2.3) activerecord (> 3.0) @@ -89,11 +49,6 @@ GIT specs: email_reply_parser (0.6) -PATH - remote: vendor/gems/discourse_emoji - specs: - discourse_emoji (0.0.1) - PATH remote: vendor/gems/discourse_plugin specs: @@ -126,7 +81,7 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - active_attr (0.7.0) + active_attr (0.8.2) activemodel (>= 3.0.2, < 4.1) activesupport (>= 3.0.2, < 4.1) active_model_serializers (0.8.1) @@ -139,7 +94,7 @@ GEM activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-postgres-hstore (0.7.6) + activerecord-postgres-hstore (0.7.7) activerecord (>= 3.1) pg-hstore (>= 1.1.5) rake @@ -149,60 +104,72 @@ GEM activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.3.4) + addressable (2.3.5) airbrake (3.1.2) activesupport builder - arel (3.0.2) + annotate (2.6.0) + activerecord (>= 2.3.0) + rake (>= 0.8.7) + arel (3.0.3) barber (0.4.2) ember-source execjs handlebars-source - better_errors (0.9.0) + better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) - binding_of_caller (0.7.1) + binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bourne (1.4.0) - mocha (~> 0.13.2) builder (3.0.4) - celluloid (0.14.1) - timers (>= 1.0.0) + celluloid (0.15.2) + timers (~> 1.1.0) certified (0.1.1) - coderay (1.0.9) - connection_pool (1.1.0) + coderay (1.1.0) + connection_pool (1.2.0) daemons (1.1.9) debug_inspector (0.0.2) - diff-lcs (1.2.4) + diff-lcs (1.2.5) diffy (3.0.1) - ember-rails (0.10.0) + docile (1.1.1) + ember-data-source (0.14) + ember-source + ember-rails (0.14.1) active_model_serializers - barber + barber (>= 0.4.1) + ember-data-source + ember-source execjs (>= 1.2) + handlebars-source + jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (1.0.0.rc6.2) - handlebars-source (= 1.0.12) + ember-source (1.2.0.1) + handlebars-source (~> 1.1.2) erubis (2.7.0) eventmachine (1.0.3) - excon (0.25.3) - execjs (1.4.0) - multi_json (~> 1.0) - fabrication (2.6.5) + excon (0.28.0) + execjs (2.0.2) + exifr (1.1.3) + fabrication (2.9.3) fakeweb (1.3.0) - faraday (0.8.7) - multipart-post (~> 1.1) - fast_blank (0.0.1) - rake - rake-compiler + faraday (0.8.8) + multipart-post (~> 1.2.0) + fast_blank (0.0.2) fast_stack (0.1.0) rake rake-compiler + fast_xor (1.1.2) + rake + rake-compiler fast_xs (0.8.0) - fastimage (1.3.0) - ffi (1.8.1) - fog (1.14.0) + fastimage (1.5.4) + addressable (~> 2.3, >= 2.3.5) + ffi (1.9.3) + flamegraph (0.0.5) + fast_stack + fog (1.18.0) builder - excon (~> 0.25.0) + excon (~> 0.28.0) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) @@ -211,52 +178,65 @@ GEM nokogiri (~> 1.5) ruby-hmac formatador (0.2.4) - fspath (2.0.4) - handlebars-source (1.0.12) - hashie (2.0.4) - highline (1.6.18) + fspath (2.0.6) + given_core (3.1.1) + sorcerer (>= 0.3.7) + handlebars-source (1.1.2) + hashie (2.0.5) + highline (1.6.20) hike (1.2.3) hiredis (0.4.5) + html_truncator (0.3.1) + nokogiri (~> 1.5) httpauth (0.2.0) - i18n (0.6.4) - ice_cube (0.11.0) - image_optim (0.8.0) - fspath (~> 2.0.3) + i18n (0.6.9) + ice_cube (0.11.1) + image_optim (0.9.1) + exifr (~> 1.1.3) + fspath (~> 2.0.5) image_size (~> 1.1.2) - in_threads (~> 1.1.1) - progress (~> 2.4.0) - image_size (1.1.2) + in_threads (~> 1.2.0) + progress (~> 3.0.0) + image_size (1.1.4) image_sorcery (1.1.0) - in_threads (1.1.1) + in_threads (1.2.0) journey (1.0.4) - json (1.8.0) + jquery-rails (3.0.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) jwt (0.1.8) multi_json (>= 1.5) - kgio (2.8.0) - librarian (0.1.0) + kgio (2.8.1) + librarian (0.1.1) highline thor (~> 0.15) libv8 (3.16.14.3) listen (0.7.3) - lru_redux (0.0.6) + lru_redux (0.8.1) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) + message_bus (0.9.3.2) + eventmachine + rack (>= 1.1.3) + redis metaclass (0.0.1) - method_source (0.8.1) - mime-types (1.23) - mini_portile (0.5.1) - minitest (4.7.3) - mocha (0.13.3) + method_source (0.8.2) + mime-types (1.25.1) + mini_portile (0.5.2) + minitest (5.1.0) + mocha (0.14.0) metaclass (~> 0.0.1) - mock_redis (0.8.1) - multi_json (1.7.8) + mock_redis (0.10.0) + msgpack (0.5.7) + multi_json (1.8.2) multipart-post (1.2.0) - mustache (0.99.4) + mustache (0.99.5) net-scp (1.1.2) net-ssh (>= 2.6.5) - net-ssh (2.6.8) + net-ssh (2.7.0) nokogiri (1.6.0) mini_portile (~> 0.5.0) oauth (0.4.7) @@ -266,17 +246,17 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.0.11) + oj (2.3.0) omniauth (1.1.4) hashie (>= 1.2, < 3) rack - omniauth-cas (1.0.1) + omniauth-cas (1.0.4) addressable (~> 2.3) - nokogiri (~> 1.5) + nokogiri (~> 1.6) omniauth (~> 1.1.0) - omniauth-facebook (1.4.1) + omniauth-facebook (1.5.1) omniauth-oauth2 (~> 1.1.0) - omniauth-github (1.1.0) + omniauth-github (1.1.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) @@ -288,37 +268,38 @@ GEM omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - omniauth-twitter (0.0.16) + omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) openid-redis-store (0.0.2) redis ruby-openid - pg (0.15.1) - pg-hstore (1.1.7) + pg (0.17.0) + pg-hstore (1.2.0) polyglot (0.3.3) - progress (2.4.0) - pry (0.9.12.1) - coderay (~> 1.0.5) + progress (3.0.0) + pry (0.9.12.4) + coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) pry-nav (0.2.3) pry (~> 0.9.10) - pry-rails (0.2.2) + pry-rails (0.3.2) pry (>= 0.9.10) - puma (2.5.1) + puma (2.7.1) rack (>= 1.1, < 2.0) - qunit-rails (0.0.3) + qunit-rails (0.0.4) railties (>= 3.2.3) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-cors (0.2.7) - rack + rack-cors (0.2.9) + rack-mini-profiler (0.9.0.pre) + rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (1.5.0) + rack-protection (1.5.1) rack rack-ssl (1.3.3) rack @@ -339,125 +320,131 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.11.0) - rake (10.0.4) - rake-compiler (0.8.3) + raindrops (0.12.0) + rake (10.1.0) + rake-compiler (0.9.2) rake rb-fsevent (0.9.3) - rb-inotify (0.9.0) + rb-inotify (0.9.2) ffi (>= 0.5.0) + rbtrace (0.4.2) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + trollop (>= 1.16.2) rdoc (3.12.2) json (~> 1.4) - redcarpet (2.2.2) - redis (3.0.4) - redis-actionpack (3.2.3) - actionpack (~> 3.2.3) - redis-rack (~> 1.4.0) + redcarpet (3.0.0) + redis (3.0.6) + redis-actionpack (3.2.4) + actionpack (~> 3.2.0) + redis-rack (~> 1.4.4) + redis-store (~> 1.1.4) + redis-activesupport (3.2.4) + activesupport (~> 3.2.0) redis-store (~> 1.1.0) - redis-activesupport (3.2.3) - activesupport (~> 3.2.3) - redis-store (~> 1.1.0) - redis-namespace (1.3.1) - redis (~> 3.0.0) - redis-rack (1.4.2) - rack (~> 1.4.1) - redis-store (~> 1.1.0) - redis-rails (3.2.3) - redis-actionpack (~> 3.2.3) - redis-activesupport (~> 3.2.3) - redis-store (~> 1.1.0) - redis-store (1.1.3) - redis (>= 2.2.0) + redis-namespace (1.4.1) + redis (~> 3.0.4) + redis-rack (1.4.4) + rack (~> 1.4.0) + redis-store (~> 1.1.4) + redis-rails (3.2.4) + redis-actionpack (~> 3.2.4) + redis-activesupport (~> 3.2.4) + redis-store (~> 1.1.4) + redis-store (1.1.4) + redis (>= 2.2) ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) rinku (1.7.3) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rspec-core (2.13.1) - rspec-expectations (2.13.0) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) - rspec-given (2.4.1) - rspec (>= 2.11) - sorcerer (>= 0.3.7) - rspec-mocks (2.13.1) - rspec-rails (2.13.0) + rspec-given (3.1.1) + given_core (= 3.1.1) + rspec (>= 2.12) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) ruby-hmac (0.4.0) - ruby-openid (2.2.3) + ruby-openid (2.3.0) sanitize (2.0.6) nokogiri (>= 1.4.4) - sass (3.2.8) + sass (3.2.12) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - shoulda (3.4.0) + shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (~> 1.0, >= 1.4.1) - shoulda-context (1.1.1) - shoulda-matchers (1.5.6) + shoulda-matchers (>= 1.4.1, < 3.0) + shoulda-context (1.1.6) + shoulda-matchers (2.4.0) activesupport (>= 3.0.0) - bourne (~> 1.3) - sidekiq (2.13.0) - celluloid (>= 0.14.1) + sidekiq (2.15.1) + celluloid (>= 0.15.1) connection_pool (>= 1.0.0) json - redis (>= 3.0) - redis-namespace - sidekiq-failures (0.1.0) - sidekiq (>= 2.2.1) - sinatra - slim - sprockets - sidetiq (0.3.6) + redis (>= 3.0.4) + redis-namespace (>= 1.3.1) + sidekiq-failures (0.2.2) + sidekiq (>= 2.9.0) + sidetiq (0.4.3) + celluloid (>= 0.14.1) ice_cube (~> 0.11.0) - sidekiq (~> 2.13.0) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - sinatra (1.3.6) + sidekiq (~> 2.15.0) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sinatra (1.4.4) rack (~> 1.4) - rack-protection (~> 1.3) - tilt (~> 1.3, >= 1.3.3) - slim (1.3.8) - temple (~> 0.6.3) - tilt (~> 1.3.3) - slop (3.4.4) - sorcerer (0.3.10) - spork (1.0.0rc3) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + slim (2.0.2) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) + slop (3.4.7) + sorcerer (1.0.2) + spork (1.0.0rc4) strong_parameters (0.2.1) actionpack (~> 3.0) activemodel (~> 3.0) railties (~> 3.0) - temple (0.6.4) + temple (0.6.7) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thin (1.5.1) + thin (1.6.1) daemons (>= 1.0.9) - eventmachine (>= 0.12.6) + eventmachine (>= 1.0.0) rack (>= 1.0.0) thor (0.18.1) - tilt (1.3.7) - timecop (0.6.1) + tilt (1.4.1) + timecop (0.7.0) timers (1.1.0) - treetop (1.4.12) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) - uglifier (2.0.1) + trollop (2.0) + tzinfo (0.3.38) + uglifier (2.3.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - unicorn (4.6.3) + json (>= 1.8.0) + unf (0.1.3) + unf_ext + unf_ext (0.0.6) + unicorn (4.7.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -470,35 +457,35 @@ DEPENDENCIES active_model_serializers activerecord-postgres-hstore airbrake (= 3.1.2) - annotate! + annotate barber better_errors binding_of_caller certified diffy (>= 3.0) - discourse_emoji! discourse_plugin! email_reply_parser! ember-rails - ember-source (= 1.0.0.rc6.2) + ember-source (~> 1.2.0.1) eventmachine fabrication fakeweb (~> 1.3.0) fast_blank - fast_xor! + fast_xor fast_xs fastimage - flamegraph! - fog - handlebars-source (= 1.0.12) + flamegraph + fog (= 1.18.0) + handlebars-source (~> 1.1.2) highline hiredis + html_truncator image_optim image_sorcery librarian (>= 0.0.25) listen (= 0.7.3) lru_redux - message_bus! + message_bus minitest mocha mock_redis @@ -521,13 +508,14 @@ DEPENDENCIES puma qunit-rails rack-cors - rack-mini-profiler! + rack-mini-profiler (= 0.9.0.pre) rack-protection rails (= 3.2.12) rails_multisite! rake rb-fsevent rb-inotify (~> 0.9) + rbtrace redcarpet redis redis-rails @@ -540,7 +528,7 @@ DEPENDENCIES sass-rails seed-fu! shoulda - sidekiq + sidekiq (= 2.15.1) sidekiq-failures sidetiq (>= 0.3.6) simple_handlebars_rails! @@ -554,5 +542,6 @@ DEPENDENCIES thin timecop uglifier + unf unicorn vestal_versions!