From 32a82c65ff7bbac8e651f12706e12e6a862cfaf5 Mon Sep 17 00:00:00 2001 From: Tom Naessens Date: Tue, 8 Sep 2015 15:12:35 +0200 Subject: [PATCH 1/2] Pls work --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 894ecb2..f254794 100644 --- a/Gemfile +++ b/Gemfile @@ -65,5 +65,5 @@ group :development do end group :production do - gem 'mysql2', '~> 0.3.0' # Database + gem 'mysql2' end diff --git a/Gemfile.lock b/Gemfile.lock index fe6a4e5..25d8f24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,7 +236,7 @@ DEPENDENCIES faker jbuilder (~> 2.0) jquery-rails - mysql2 (~> 0.3.0) + mysql2 omniauth-oauth2 rails (= 4.2.4) rspec-rails From 0909bdda3ddc7b45d315ff8b7d725c2efbe13d3c Mon Sep 17 00:00:00 2001 From: Tom Naessens Date: Tue, 8 Sep 2015 15:13:24 +0200 Subject: [PATCH 2/2] Do bundle install --- Gemfile.lock | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index f3b37ef..13ddcb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,6 +96,11 @@ GEM jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) + jquery-datatables-rails (3.3.0) + actionpack (>= 3.1) + jquery-rails + railties (>= 3.1) + sass-rails jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -237,6 +242,7 @@ DEPENDENCIES factory_girl_rails faker jbuilder (~> 2.0) + jquery-datatables-rails (~> 3.3.0) jquery-rails mysql2 omniauth-oauth2