mirror of
https://github.com/amiaopensource/ffmprovisr.git
synced 2024-11-10 07:27:23 +01:00
but like for real jesus
This commit is contained in:
parent
f4f01a2864
commit
41b4f7fa08
2
Gemfile
2
Gemfile
@ -4,7 +4,7 @@ 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'
|
# gem 'sqlite3'
|
||||||
# Swappin'
|
# Swappin'
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
|
10
Gemfile.lock
10
Gemfile.lock
@ -82,9 +82,9 @@ GEM
|
|||||||
sass (~> 3.2.0)
|
sass (~> 3.2.0)
|
||||||
sprockets (~> 2.8, <= 2.11.0)
|
sprockets (~> 2.8, <= 2.11.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
sdoc (0.4.0)
|
sdoc (0.4.1)
|
||||||
json (~> 1.8)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0, < 5.0)
|
rdoc (~> 4.0)
|
||||||
spring (1.1.3)
|
spring (1.1.3)
|
||||||
sprockets (2.11.0)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
@ -95,7 +95,6 @@ GEM
|
|||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
sqlite3 (1.3.9)
|
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
@ -104,7 +103,7 @@ GEM
|
|||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (2.2.2)
|
turbolinks (2.2.2)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.1)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.3)
|
uglifier (2.5.3)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
@ -122,6 +121,5 @@ DEPENDENCIES
|
|||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
spring
|
spring
|
||||||
sqlite3
|
|
||||||
turbolinks
|
turbolinks
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
|
@ -1,25 +1,16 @@
|
|||||||
# SQLite version 3.x
|
development:
|
||||||
# gem install sqlite3
|
adapter: postgresql
|
||||||
#
|
database: my_database_development
|
||||||
# Ensure the SQLite 3 gem is defined in your Gemfile
|
pool: 5
|
||||||
# gem 'sqlite3'
|
timeout: 5000
|
||||||
#
|
test:
|
||||||
default: &default
|
adapter: postgresql
|
||||||
adapter: sqlite3
|
database: my_database_test
|
||||||
pool: 5
|
pool: 5
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
|
|
||||||
development:
|
|
||||||
<<: *default
|
|
||||||
database: db/development.sqlite3
|
|
||||||
|
|
||||||
# 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:
|
|
||||||
<<: *default
|
|
||||||
database: db/test.sqlite3
|
|
||||||
|
|
||||||
production:
|
production:
|
||||||
<<: *default
|
adapter: postgresql
|
||||||
database: db/production.sqlite3
|
database: my_database_production
|
||||||
|
pool: 5
|
||||||
|
timeout: 5000
|
Loading…
Reference in New Issue
Block a user