diff --git a/Gemfile b/Gemfile index 707b86532..cd90d4858 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "json-schema", "2.5.1" # Authentication gem "devise", "3.5.1" -gem "devise_lastseenable", "0.0.4" +gem "devise_lastseenable", "0.0.6" gem "devise-token_authenticatable", "~> 0.4.0" # Captcha @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha" # Background processing -gem "sidekiq", "3.4.1" +gem "sidekiq", "3.4.2" gem "sinatra", "1.4.6" # Scheduled processing @@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "3.3.5" gem "compass-rails", "2.0.4" gem "sass-rails", "5.0.1" -gem "autoprefixer-rails", "5.2.1" +gem "autoprefixer-rails", "5.2.1.1" gem "bootstrap-switch-rails", "3.3.3" # Database @@ -68,12 +68,12 @@ group :postgresql, optional: true do gem "pg", "0.18.1" end -gem "activerecord-import", "0.8.0" +gem "activerecord-import", "0.10.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.31.0" +gem "fog", "1.32.0" gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" @@ -110,7 +110,7 @@ source "https://rails-assets.org" do gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.3" + gem "rails-assets-perfect-scrollbar", "0.6.4" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" gem "rails-assets-autosize", "3.0.8" end @@ -160,13 +160,13 @@ gem "acts-as-taggable-on", "3.5.0" gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" -gem "faraday_middleware", "0.9.1" +gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "0.7.2" # Views -gem "gon", "5.2.3" +gem "gon", "6.0.1" gem "haml", "4.0.6" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.0.7" @@ -226,15 +226,15 @@ group :development do # Automatic test runs gem "guard-cucumber", "1.5.4" gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.5.2" + gem "guard-rspec", "4.6.3" gem "guard-rubocop", "1.2.0" - gem "guard", "2.12.5", require: false + gem "guard", "2.13.0", require: false gem "rb-fsevent", "0.9.5", require: false gem "rb-inotify", "0.9.5", require: false # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.32.0" + gem "rubocop", "0.32.1" gem "pronto", "0.4.2" gem "pronto-jshint", "0.4.2" gem "pronto-rubocop", "0.4.4" @@ -266,19 +266,19 @@ group :test do gem "capybara", "2.4.4" gem "database_cleaner" , "1.4.1" - gem "selenium-webdriver", "2.45.0" + gem "selenium-webdriver", "2.46.2" # General helpers gem "factory_girl_rails", "4.5.0" - gem "timecop", "0.7.4" + gem "timecop", "0.8.0" gem "webmock", "1.21.0", require: false gem "shoulda-matchers", "2.8.0", require: false end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.3.2" + gem "rspec-rails", "3.3.3" # Cucumber (integration tests) gem "cucumber-rails", "1.4.2", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 99da945ee..668a7f3b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM activemodel (= 4.2.3) activesupport (= 4.2.3) arel (~> 6.0) - activerecord-import (0.8.0) + activerecord-import (0.10.0) activerecord (>= 3.0) activesupport (4.2.3) i18n (~> 0.7) @@ -49,15 +49,15 @@ GEM activesupport (>= 3.0.0) rack (>= 1.1.0) addressable (2.3.8) - arel (6.0.0) + arel (6.0.2) asset_sync (1.1.0) activemodel fog (>= 1.8.0) unf ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.2.1) + astrolabe (1.3.1) + parser (~> 2.2) + autoprefixer-rails (5.2.1.1) execjs json backbone-on-rails (1.2.0.0) @@ -72,7 +72,7 @@ GEM bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.2) - byebug (4.0.5) + byebug (5.0.0) columnize (= 0.9.0) capybara (2.4.4) mime-types (>= 1.16) @@ -144,10 +144,9 @@ GEM warden (~> 1.2.3) devise-token_authenticatable (0.4.0) devise (~> 3.5.0) - devise_lastseenable (0.0.4) + devise_lastseenable (0.0.6) devise rails (>= 3.0.4) - warden diaspora-vines (0.1.27) activerecord (~> 4.1) bcrypt (~> 3.1) @@ -180,7 +179,7 @@ GEM ethon (0.7.4) ffi (>= 1.3.0) eventmachine (1.0.7) - excon (0.45.3) + excon (0.45.4) execjs (2.5.2) eye (0.7.pre) celluloid (~> 0.16.0) @@ -198,20 +197,20 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.9.1) + faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.8) + ffi (1.9.10) fission (0.5.0) CFPropertyList (~> 2.2) fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.31.0) + fog (1.32.0) fog-atmos - fog-aws (~> 0.0) + fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) - fog-core (~> 1.30) - fog-ecloud + fog-core (~> 1.32) + fog-ecloud (= 0.1.1) fog-google (>= 0.0.2) fog-json fog-local @@ -232,26 +231,26 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.5.0) + fog-aws (0.7.3) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.7.1) + fog-brightbox (0.8.0) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.31.1) + fog-core (1.32.0) builder excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.1.3) + fog-ecloud (0.1.1) fog-core fog-xml - fog-google (0.0.5) + fog-google (0.0.7) fog-core fog-json fog-xml @@ -264,7 +263,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-profitbricks (0.0.3) + fog-profitbricks (0.0.5) fog-core fog-xml nokogiri @@ -282,7 +281,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.6) + fog-softlayer (0.4.7) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -300,7 +299,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.3.0.0) + font-awesome-rails (4.4.0.0) railties (>= 3.2, < 5.0) formatador (0.2.5) fuubar (2.0.0) @@ -313,14 +312,14 @@ GEM terminal-table globalid (0.3.5) activesupport (>= 4.1.0) - gon (5.2.3) - actionpack (>= 2.3.0) + gon (6.0.1) + actionpack (>= 3.0) json multi_json - request_store (>= 1.0.5) - guard (2.12.5) + request_store (>= 1.0) + guard (2.13.0) formatador (>= 0.2.4) - listen (~> 2.7) + listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) @@ -335,7 +334,7 @@ GEM guard-jshintrb (1.1.1) guard (~> 2.0) jshintrb - guard-rspec (4.5.2) + guard-rspec (4.6.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -397,13 +396,12 @@ GEM json (1.8.3) json-schema (2.5.1) addressable (~> 2.3.7) - jwt (1.5.0) + jwt (1.5.1) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.3) - listen (2.10.1) - celluloid (~> 0.16.0) + listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) little-plugger (1.1.3) @@ -432,7 +430,7 @@ GEM mobile-fu (1.3.1) rack-mobile-detect rails - multi_json (1.11.1) + multi_json (1.11.2) multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -443,10 +441,10 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - nio4r (1.1.0) + nio4r (1.1.1) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - notiffany (0.0.6) + notiffany (0.0.7) nenv (~> 0.1) shellany (~> 0.0) oauth (0.4.7) @@ -466,7 +464,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.0) + omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-tumblr (1.1) @@ -480,7 +478,7 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.2.2.5) + parser (2.2.2.6) ast (>= 1.1, < 3.0) pg (0.18.1) phantomjs (1.9.8.0) @@ -500,8 +498,8 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.1.0) - byebug (~> 4.0) + pry-byebug (3.2.0) + byebug (~> 5.0) pry (~> 0.10) pry-debundle (0.8) pry @@ -570,7 +568,7 @@ GEM rails-assets-markdown-it-sanitizer (0.3.2) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.3) + rails-assets-perfect-scrollbar (0.6.4) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.6) @@ -605,7 +603,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) - raindrops (0.13.0) + raindrops (0.15.0) rake (10.4.2) rb-fsevent (0.9.5) rb-inotify (0.9.5) @@ -615,7 +613,7 @@ GEM redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) - request_store (1.1.0) + request_store (1.2.0) responders (2.1.0) railties (>= 4.2.0, < 5) roxml (3.1.6) @@ -625,17 +623,17 @@ GEM rspec-core (~> 3.3.0) rspec-expectations (~> 3.3.0) rspec-mocks (~> 3.3.0) - rspec-core (3.3.1) + rspec-core (3.3.2) rspec-support (~> 3.3.0) - rspec-expectations (3.3.0) + rspec-expectations (3.3.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) rspec-instafail (0.2.6) rspec - rspec-mocks (3.3.1) + rspec-mocks (3.3.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) - rspec-rails (3.3.2) + rspec-rails (3.3.3) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) @@ -644,7 +642,7 @@ GEM rspec-mocks (~> 3.3.0) rspec-support (~> 3.3.0) rspec-support (3.3.0) - rubocop (0.32.0) + rubocop (0.32.1) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -655,7 +653,7 @@ GEM rubyzip (1.1.7) rugged (0.22.2) safe_yaml (1.0.4) - sass (3.4.14) + sass (3.4.16) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -665,7 +663,7 @@ GEM sawyer (0.6.0) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) - selenium-webdriver (2.45.0) + selenium-webdriver (2.46.2) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -673,12 +671,12 @@ GEM shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (3.4.1) + sidekiq (3.4.2) celluloid (~> 0.16.0) - connection_pool (>= 2.1.1) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) sidetiq (0.6.3) celluloid (>= 0.14.1) ice_cube (= 0.11.1) @@ -704,7 +702,7 @@ GEM spring (>= 0.9.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (2.12.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -721,7 +719,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.4) + timecop (0.8.0) timers (4.0.1) hitimes twitter (5.14.0) @@ -768,12 +766,12 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.3) - activerecord-import (= 0.8.0) + activerecord-import (= 0.10.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 5.2.1) + autoprefixer-rails (= 5.2.1.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 3.3.5) bootstrap-switch-rails (= 3.3.3) @@ -785,7 +783,7 @@ DEPENDENCIES database_cleaner (= 1.4.1) devise (= 3.5.1) devise-token_authenticatable (~> 0.4.0) - devise_lastseenable (= 0.0.4) + devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.1.27) diaspora_federation-rails (= 0.0.3) entypo-rails (= 3.0.0.pre.rc2) @@ -793,15 +791,15 @@ DEPENDENCIES factory_girl_rails (= 4.5.0) faraday (= 0.9.1) faraday-cookie_jar (= 0.0.6) - faraday_middleware (= 0.9.1) + faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog (= 1.31.0) + fog (= 1.32.0) fuubar (= 2.0.0) - gon (= 5.2.3) - guard (= 2.12.5) + gon (= 6.0.1) + guard (= 2.13.0) guard-cucumber (= 1.5.4) guard-jshintrb (= 1.1.1) - guard-rspec (= 4.5.2) + guard-rspec (= 4.6.3) guard-rubocop (= 1.2.0) haml (= 4.0.6) handlebars_assets (= 0.20.2) @@ -861,7 +859,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.3.2)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.3)! + rails-assets-perfect-scrollbar (= 0.6.4)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.6.8) @@ -872,14 +870,14 @@ DEPENDENCIES responders (= 2.1.0) roxml (= 3.1.6) rspec-instafail (= 0.2.6) - rspec-rails (= 3.3.2) - rubocop (= 0.32.0) + rspec-rails (= 3.3.3) + rubocop (= 0.32.1) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) sass-rails (= 5.0.1) - selenium-webdriver (= 2.45.0) + selenium-webdriver (= 2.46.2) shoulda-matchers (= 2.8.0) - sidekiq (= 3.4.1) + sidekiq (= 3.4.2) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.4) simplecov (= 0.10.0) @@ -889,7 +887,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) - timecop (= 0.7.4) + timecop (= 0.8.0) twitter (= 5.14.0) twitter-text (= 1.12.0) typhoeus (= 0.7.2)