From dd8bc0d6d4e94cbbd949e4886ee3349778a670bf Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Thu, 3 Sep 2015 15:13:16 -0400
Subject: [PATCH] Update to ruby 1.9.3

---
 .ruby-version         |  2 +-
 Gemfile               |  6 +++---
 Gemfile.lock          | 13 +++----------
 config/application.rb |  3 ++-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 88d3ee7..77fee73 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-1.8.7
+1.9.3
diff --git a/Gemfile b/Gemfile
index a84d4b3..9e4c501 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,6 @@ gem 'will_paginate', "~>3.0"
 #    gem 'brazilian-rails', '3.3.0', :path => './vendor/gems/brazilian-rails/brI18n/'
 #end
 
-group :development do
-    gem 'mongrel'
-end
+#group :development do
+#    gem 'mongrel'
+#end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e1ebc9..a768354 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,6 @@ GEM
     builder (3.0.4)
     calendar_helper (0.2.5)
       open4
-    cgi_multipart_eof_fix (2.5.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -56,13 +55,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    daemons (1.1.9)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fastthread (1.0.7)
-    gem_plugin (0.2.3)
     haml (3.1.8)
     hike (1.2.3)
     hpricot (0.8.6)
@@ -77,11 +73,6 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
     multi_json (1.7.7)
     open4 (1.3.0)
     polyglot (0.3.3)
@@ -149,10 +140,12 @@ DEPENDENCIES
   icalendar (~> 1.0)
   jquery-rails
   json
-  mongrel
   rails (~> 3.2)
   sass-rails (~> 3.2.3)
   shoulda (~> 2.11)
   sqlite3
   uglifier (>= 1.0.3)
   will_paginate (~> 3.0)
+
+BUNDLED WITH
+   1.10.6
diff --git a/config/application.rb b/config/application.rb
index 4e74bf0..ebc1083 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-require 'lib/nasty_hacks.rb'
+require './lib/nasty_hacks.rb'
 require 'active_support/core_ext/numeric/bytes'
 
 if defined?(Bundler)