mirror/ffmprovisr
1
0
Fork 0
mirror of https://github.com/amiaopensource/ffmprovisr.git synced 2024-11-10 07:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly set up databases in a less cold-drug-addled way

Browse Source
This commit is contained in:
ablwr 2014-08-12 08:48:05 -04:00
parent 64f7225a6d
commit 0d58bf7e02
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@ -4,9 +4,13 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.4' gem 'rails', '4.1.4'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
# gem 'sqlite3' group :test, :development do
gem 'sqlite3'
end
# Swappin' # Swappin'
gem 'pg' group :production do
gem 'pg'
end
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets

4
config/database.yml
View File

@ -1,10 +1,10 @@
development: development:
adapter: postgresql adapter: sqlite3
database: my_database_development database: my_database_development
pool: 5 pool: 5
timeout: 5000 timeout: 5000
test: test:
adapter: postgresql adapter: sqlite3
database: my_database_test database: my_database_test
pool: 5 pool: 5
timeout: 5000 timeout: 5000