Merge branch 'master' into problem-count

.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.5
+  - 2.2.3
+  - 2.1.7
   - 1.9.3
 script:
   - export RAILS_ENV=test

Gemfile

@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.0'
+gem 'rails', '4.2.4'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0.1'
+gem 'sass-rails', '~> 5.0.4'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '~> 2.7.0'
+gem 'uglifier', '~> 2.7.2'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.1.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -19,7 +19,7 @@ gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+gem 'jbuilder', '~> 2.3.1'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0',          group: :doc
 
@@ -29,19 +29,19 @@ gem 'web-console', '~> 2.0', group: :development
 gem 'quiet_assets', group: :development
 
 # Use Coveralls for coverage documentation
-gem 'coveralls', '~> 0.7.2', require: false
+gem 'coveralls', '~> 0.8.2', require: false
 
-gem 'bootstrap-sass', '~> 3.3.1'
+gem 'bootstrap-sass', '~> 3.3.5.1'
 gem 'autoprefixer-rails'
 
-gem 'bh', '~> 1.3.1'
+gem 'bh', '~> 1.3.4'
 
-gem 'will_paginate', '~> 3.0.6'
+gem 'will_paginate', '~> 3.0.7'
 gem 'will_paginate-bootstrap'
 
 gem 'mathjax-rails'
 
-gem 'devise', '~> 3.4.1'
+gem 'devise', '~> 3.5.2'
 gem 'devise-bootstrap-views'
 
 gem 'codemirror-rails'

Gemfile.lock

@@ -1,136 +1,139 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
+    actionmailer (4.2.4)
-      actionpack (= 4.2.0)
+      actionpack (= 4.2.4)
-      actionview (= 4.2.0)
+      actionview (= 4.2.4)
-      activejob (= 4.2.0)
+      activejob (= 4.2.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
+    actionpack (4.2.4)
-      actionview (= 4.2.0)
+      actionview (= 4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
-      rack (~> 1.6.0)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.0)
+    actionview (4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.0)
+    activejob (4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
+    activemodel (4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.2.0)
+    activerecord (4.2.4)
-      activemodel (= 4.2.0)
+      activemodel (= 4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
-    autoprefixer-rails (5.1.5)
+    autoprefixer-rails (6.0.2)
       execjs
       json
     bcrypt (3.1.10)
-    bh (1.3.1)
+    bh (1.3.4)
       actionpack
       activesupport
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.3)
+    bootstrap-sass (3.3.5.1)
       autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
+      sass (>= 3.3.0)
     builder (3.2.2)
-    codemirror-rails (4.8)
+    codemirror-rails (5.6)
       railties (>= 3.0, < 5)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.0)
+    coffee-script-source (1.9.1.1)
-    coveralls (0.7.9)
+    coveralls (0.8.2)
-      multi_json (~> 1.10)
+      json (~> 1.8)
-      rest-client (~> 1.7)
+      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     debug_inspector (0.0.2)
-    devise (3.4.1)
+    devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-bootstrap-views (0.0.4)
+    devise-bootstrap-views (0.0.6)
     docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.6.0)
-    ffi (1.9.6)
+    ffi (1.9.10)
-    globalid (0.3.2)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
-    jbuilder (2.2.6)
+    jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.3)
+    jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
-    loofah (2.0.1)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mathjax-rails (2.3.0)
+    mathjax-rails (2.5.1)
       railties (>= 3.0)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.8.0)
-    multi_json (1.10.1)
+    multi_json (1.11.2)
-    netrc (0.10.2)
+    netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
+    rails (4.2.4)
-      actionmailer (= 4.2.0)
+      actionmailer (= 4.2.4)
-      actionpack (= 4.2.0)
+      actionpack (= 4.2.4)
-      actionview (= 4.2.0)
+      actionview (= 4.2.4)
-      activejob (= 4.2.0)
+      activejob (= 4.2.4)
-      activemodel (= 4.2.0)
+      activemodel (= 4.2.4)
-      activerecord (= 4.2.0)
+      activerecord (= 4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.4)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    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.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.0)
+    railties (4.2.4)
-      actionpack (= 4.2.0)
+      actionpack (= 4.2.4)
-      activesupport (= 4.2.0)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -138,56 +141,57 @@ GEM
       json (~> 1.4)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
       ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    sass (3.4.11)
+    sass (3.4.18)
-    sass-rails (5.0.1)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    simplecov (0.9.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
+      json (~> 1.8)
-      simplecov-html (~> 0.8.0)
+      simplecov-html (~> 0.10.0)
-    simplecov-html (0.8.0)
+    simplecov-html (0.10.0)
-    sprockets (2.12.3)
+    sprockets (3.3.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.3)
-    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
-    tins (1.3.4)
+    tins (1.6.0)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.1)
+    tzinfo-data (1.2015.6)
       tzinfo (>= 1.0.0)
-    uglifier (2.7.0)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     warden (1.2.3)
       rack (>= 1.0)
-    web-console (2.0.0)
+    web-console (2.2.1)
-      activemodel (~> 4.0)
+      activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
-      railties (~> 4.0)
+      railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
     will_paginate (3.0.7)
     will_paginate-bootstrap (1.0.1)
@@ -198,24 +202,24 @@ PLATFORMS
 
 DEPENDENCIES
   autoprefixer-rails
-  bh (~> 1.3.1)
+  bh (~> 1.3.4)
-  bootstrap-sass (~> 3.3.1)
+  bootstrap-sass (~> 3.3.5.1)
   codemirror-rails
   coffee-rails (~> 4.1.0)
-  coveralls (~> 0.7.2)
+  coveralls (~> 0.8.2)
-  devise (~> 3.4.1)
+  devise (~> 3.5.2)
   devise-bootstrap-views
-  jbuilder (~> 2.0)
+  jbuilder (~> 2.3.1)
   jquery-rails
   mathjax-rails
   quiet_assets
-  rails (= 4.2.0)
+  rails (= 4.2.4)
-  sass-rails (~> 5.0.1)
+  sass-rails (~> 5.0.4)
   sdoc (~> 0.4.0)
   sqlite3
   turbolinks
   tzinfo-data
-  uglifier (~> 2.7.0)
+  uglifier (~> 2.7.2)
   web-console (~> 2.0)
-  will_paginate (~> 3.0.6)
+  will_paginate (~> 3.0.7)
   will_paginate-bootstrap

app/views/layouts/application.html.erb

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title><%= t :site_title %></title>
+  <%= favicon_link_tag %>
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <script type="text/x-mathjax-config">

test/fixtures/admins.yml

@@ -7,4 +7,4 @@
 
 admin:
   email: admin@example.com
-  encrypted_password: <%= Devise.bcrypt(Admin, 'password') %>
+  encrypted_password: <%= Devise::Encryptor.digest(Admin, 'password') %>