From 343d2543b51d4fe694a439a22198a0585997b9ef Mon Sep 17 00:00:00 2001 From: Tanguy PATTE Date: Tue, 11 Aug 2015 14:38:10 +0200 Subject: [PATCH 1/3] remove production database sqlite --- config/database.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/config/database.yml b/config/database.yml index 63275f4d1..1a9a3f8cc 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,13 +1,3 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: 5 - timeout: 5000 development: adapter: postgresql @@ -18,9 +8,7 @@ development: username: admi_facile password: lol -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. + test: adapter: postgresql encoding: unicode @@ -30,6 +18,4 @@ test: username: admi_facile password: lol -production: - <<: *default - database: db/production.sqlite3 + From a175e646e8f07967b472d5d7c11c7a1052b3e543 Mon Sep 17 00:00:00 2001 From: Tanguy PATTE Date: Tue, 11 Aug 2015 14:38:20 +0200 Subject: [PATCH 2/3] add ruby version file --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..cd57a8b95 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.5 From ff4152023fd7953d3b97be2c1eea7512da6c61fc Mon Sep 17 00:00:00 2001 From: Tanguy PATTE Date: Tue, 11 Aug 2015 15:36:48 +0200 Subject: [PATCH 3/3] remove gem sqlite3 --- Gemfile | 3 +-- Gemfile.lock | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index efb17008d..5d3801b8a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.0' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' + # 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 8aca4a172..2d2c769ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,7 +239,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -303,11 +302,7 @@ DEPENDENCIES shoulda-matchers simplecov spring - sqlite3 turbolinks uglifier (>= 1.3.0) web-console (~> 2.0) webmock - -BUNDLED WITH - 1.10.4