diff --git a/Gemfile b/Gemfile index 8eed259..3cd38e6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" ruby "2.2.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails" -gem "rails", "4.2.1" +gem "rails", "~> 4.2.5.1" # Use postgresql as the database for Active Record gem "pg" @@ -12,13 +12,13 @@ gem "pg" gem "sass-rails", "~> 5.0" # Use Uglifier as compressor for JavaScript assets -gem "uglifier", ">= 1.3.0" +gem "uglifier", ">= 2.7.2" # Use CoffeeScript for .coffee assets and views gem "coffee-rails", "~> 4.1.0" # Use jquery as the JavaScript library -gem "jquery-rails" +gem "jquery-rails", ">= 4.0.4" # OpenBSD bcrypt() password hashing algorithm # https://github.com/codahale/bcrypt-ruby @@ -51,7 +51,7 @@ group :development, :test do # Access an IRB console on exception pages or by using <%= console %> in views # https://github.com/rails/web-console - gem "web-console", "~> 2.0" + gem "web-console", ">= 2.1.3" # Spring speeds up development by keeping your application running in # the background. @@ -117,3 +117,7 @@ group :production do # https://github.com/heroku/rails_12factor gem "rails_12factor" end + +gem "nokogiri", ">= 1.6.7.2" +gem "rack", ">= 1.6.2" +gem "rails-html-sanitizer", "~> 1.0.3" diff --git a/Gemfile.lock b/Gemfile.lock index e195433..8c6f7d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,50 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) + actionpack (4.2.5.1) + actionview (= 4.2.5.1) + activesupport (= 4.2.5.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.1) - activesupport (= 4.2.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.5.1) + activesupport (= 4.2.5.1) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.5.1) + activemodel (= 4.2.5.1) + activesupport (= 4.2.5.1) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.3.8) - arel (6.0.0) + arel (6.0.3) ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) awesome_print (1.6.1) bcrypt (3.1.10) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) breadcrumbs_on_rails (2.3.0) builder (3.2.2) bullet (4.14.7) @@ -72,6 +70,7 @@ GEM execjs coffee-script-source (1.9.1.1) columnize (0.9.0) + concurrent-ruby (1.0.0) database_cleaner (1.4.1) debug_inspector (0.0.2) diff-lcs (1.2.5) @@ -82,7 +81,7 @@ GEM activesupport (>= 3.0) request_store (~> 1.0) erubis (2.7.0) - execjs (2.5.2) + execjs (2.6.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -90,7 +89,7 @@ GEM railties (>= 3.0.0) ffi (1.9.8) formatador (0.2.5) - globalid (0.3.5) + globalid (0.3.6) activesupport (>= 4.1.0) guard (2.12.5) formatador (>= 0.2.4) @@ -106,7 +105,7 @@ GEM rubocop (~> 0.20) hitimes (1.2.2) i18n (0.7.0) - jquery-rails (4.0.3) + jquery-rails (4.1.0) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -117,19 +116,19 @@ GEM celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.9) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.6.1) - mini_portile (0.6.2) - minitest (5.7.0) + mime-types (2.99) + mini_portile2 (2.0.0) + minitest (5.8.4) multi_json (1.11.0) nenv (0.2.0) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.6) nenv (~> 0.1) shellany (~> 0.0) @@ -155,40 +154,40 @@ GEM rack (>= 1.1, < 2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.1) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) + rails (4.2.5.1) + actionmailer (= 4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) + activemodel (= 4.2.5.1) + activerecord (= 4.2.5.1) + activesupport (= 4.2.5.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.5.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.5.1) + actionpack (= 4.2.5.1) + activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) - rake (10.4.2) + rake (10.5.0) rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -234,12 +233,13 @@ GEM simplecov-html (0.10.0) slop (3.6.0) spring (1.3.6) - sprockets (3.2.0) - rack (~> 1.0) - sprockets-rails (2.3.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -247,15 +247,14 @@ GEM hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) uniform_notifier (1.9.0) - web-console (2.1.2) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) + web-console (3.1.1) + activemodel (>= 4.2) + debug_inspector + railties (>= 4.2) websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -277,20 +276,23 @@ DEPENDENCIES draper factory_girl_rails guard-rubocop - jquery-rails + jquery-rails (>= 4.0.4) launchy + nokogiri (>= 1.6.7.2) pg poltergeist pry-byebug pry-rails puma quiet_assets - rails (= 4.2.1) + rack (>= 1.6.2) + rails (~> 4.2.5.1) + rails-html-sanitizer (~> 1.0.3) rails_12factor rspec-rails rubocop sass-rails (~> 5.0) shoulda-matchers spring - uglifier (>= 1.3.0) - web-console (~> 2.0) + uglifier (>= 2.7.2) + web-console (>= 2.1.3)