Update for rails 4

Add matches to routes
Update mysql2 gem

Remove caldner for moment

Gemfile

@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-ruby '2.2.2'
+ruby '2.2.10'
 
 gem 'dotenv-rails', '~> 0.10.0'
 gem 'rails', '~> 4.0.13'
-gem 'mysql2', '~> 0.3.15'
+gem 'mysql2', '~> 0.3.18'
 gem 'dalli', '~> 2.7.0'
 gem 'puma', '~> 2.11.1'
 

Gemfile.lock

@@ -128,6 +128,7 @@ GEM
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.8.3)
+    libv8 (3.16.14.19)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
@@ -137,7 +138,7 @@ GEM
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.15)
+    mysql2 (0.3.21)
     neat (1.6.0)
       bourbon (>= 3.1)
       sass (>= 3.3)
@@ -186,6 +187,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
+    ref (2.0.0)
     rmagick (2.13.4)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
@@ -238,6 +240,9 @@ GEM
       tins (~> 1.0)
     test-unit (3.1.3)
       power_assert
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -288,7 +293,7 @@ DEPENDENCIES
   haml (~> 4.0.5)
   i18n_country_select (~> 1.1.5)
   jquery-rails (~> 2.0.2)
-  mysql2 (~> 0.3.15)
+  mysql2 (~> 0.3.18)
   neat (~> 1.6.0)
   newrelic_rpm (~> 3.7.2.195)
   nokogiri (~> 1.6.1)
@@ -308,10 +313,14 @@ DEPENDENCIES
   simplecov (~> 0.7.1)
   steam-condenser!
   test-unit (~> 3.1.3)
+  therubyracer (~> 0.12.1)
   timecop (~> 0.7.1)
   tinymce-rails (~> 3.5.9)
   uglifier (~> 2.5.0)
   will_paginate (~> 3.0.5)
 
+RUBY VERSION
+   ruby 2.2.10p489
+
 BUNDLED WITH
-   1.10.6
+   1.17.1

app/views/layouts/application.html.erb

@@ -22,7 +22,7 @@
           </div>
           <div id="sidebar">
             <%= yield :sidebar %>
-            <% ['calendar', 'shoutbox', 'posts', 'poll'].each do |widget| %>
+            <% ['shoutbox', 'posts', 'poll'].each do |widget| %>
               <%= render partial: "widgets/#{widget}" %>  
             <% end %>
           </div>

config/routes.rb

@@ -42,6 +42,7 @@ Ensl::Application.routes.draw do
   resources :groupers
   resources :forumers
   resources :topics
+  resources :matches
 
   get 'forums/up'
   get 'forums/down'