Merge branch 'mysql2-conflict-fix'

Gemfile

@@ -5,7 +5,7 @@ gem 'rails', '~> 4.0.0'
 
 gem 'unicorn'
 gem 'capistrano'
-gem 'rvm-capistrano'
+gem 'rvm-capistrano', require: false
 
 gem 'sass-rails', '~> 4.0.0'
 gem 'slim'
@@ -18,7 +18,7 @@ group :doc do
   gem 'sdoc', require: false
 end
 
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.18'
 gem 'net-ldap', git: 'git://github.com/ruby-ldap/ruby-net-ldap.git', branch: 'master'
 
 gem 'sentry-raven'

Gemfile.lock

@@ -1,17 +1,3 @@
-GIT
-  remote: git://github.com/rsim/oracle-enhanced.git
-  revision: 36e19490875c8e76ce35c615777d5d69b0737667
-  specs:
-    activerecord-oracle_enhanced-adapter (1.5.2)
-
-GIT
-  remote: git://github.com/plataformatec/simple_form.git
-  revision: 32019827798eddbecc19676d69eb406a4f3902cc
-  specs:
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
-
 GIT
   remote: git://github.com/EppO/rolify.git
   revision: befc8db8d1894cc2fe86407dbedc1aebb3f3592f
@@ -26,6 +12,20 @@ GIT
       rails (>= 3, < 5)
       thor (~> 0.14)
 
+GIT
+  remote: git://github.com/plataformatec/simple_form.git
+  revision: 32019827798eddbecc19676d69eb406a4f3902cc
+  specs:
+    simple_form (3.0.1)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
+
+GIT
+  remote: git://github.com/rsim/oracle-enhanced.git
+  revision: 36e19490875c8e76ce35c615777d5d69b0737667
+  specs:
+    activerecord-oracle_enhanced-adapter (1.5.2)
+
 GIT
   remote: git://github.com/ruby-ldap/ruby-net-ldap.git
   revision: bbef82f22494864f5c0e53d4dffb21cead3fc274
@@ -198,7 +198,7 @@ GEM
     minitest (4.7.5)
     multi_json (1.11.0)
     multipart-post (2.0.0)
-    mysql2 (0.3.15)
+    mysql2 (0.3.20)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -387,7 +387,7 @@ DEPENDENCIES
   jquery-rails
   launchy
   letter_opener
-  mysql2
+  mysql2 (~> 0.3.18)
   net-ldap!
   nokogiri
   paperclip (~> 4.1)
@@ -420,3 +420,6 @@ DEPENDENCIES
   will_paginate (~> 3.0)
   will_paginate-bootstrap
   yajl-ruby
+
+BUNDLED WITH
+   1.10.3