Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile

Conflicts:
	.ruby-version

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.1.5

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

Gemfile.lock

@@ -253,7 +253,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)
@@ -318,11 +317,7 @@ DEPENDENCIES
   shoulda-matchers
   simplecov
   spring
-  sqlite3
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   webmock
-
-BUNDLED WITH
-   1.10.4

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