From 40973c5a88b1bc080f55d4cb5690f9650e4741e9 Mon Sep 17 00:00:00 2001 From: Dan Roberts Date: Mon, 17 Oct 2016 14:06:51 -0700 Subject: [PATCH] Remove postgres line from Gemfile --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6a1690dd28..c69f4ddde9 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby '2.3.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.6' # Use postgresql as the database for Active Record -gem 'pg', '~> 0.15' +# gem 'pg', '~> 0.15' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index a9da33c60c..20975578b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,6 @@ GEM multi_json (1.11.3) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - pg (0.18.4) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -147,7 +146,6 @@ DEPENDENCIES coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails - pg (~> 0.15) rails (= 4.2.6) sass-rails (~> 5.0) sdoc (~> 0.4.0) @@ -156,5 +154,8 @@ DEPENDENCIES uglifier (>= 1.3.0) web-console (~> 2.0) +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH - 1.12.1 + 1.13.5