heroku push

This commit is contained in:
YOUR NAME 2017-10-13 14:19:00 +11:00
parent f0676cc583
commit 9231e01014
3 changed files with 29 additions and 10 deletions

19
Gemfile
View file

@ -8,8 +8,7 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use postgress as the database for Active Record
gem 'postgresql'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
@ -39,19 +38,25 @@ gem 'devise'
#Authentication via facebook (loging in)
gem 'omniauth-facebook'
#Jquery as dependency for materialize gem
#Jquery as dependency for materialize
gem 'jquery-rails'
#Materialize gem for styling
gem 'materialize-sass'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'sqlite3'
end
group :development do
@ -63,5 +68,13 @@ group :development do
gem 'spring-watcher-listen', '~> 2.0.0'
end
group :production do
gem 'pg'
gem 'rails_12factor'
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

View file

@ -126,8 +126,6 @@ GEM
omniauth (~> 1.2)
orm_adapter (0.5.0)
pg (0.21.0)
postgresql (1.0.0)
pg
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
@ -150,6 +148,11 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
@ -191,6 +194,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
@ -227,13 +231,15 @@ DEPENDENCIES
listen (>= 3.0.5, < 3.2)
materialize-sass
omniauth-facebook
postgresql
pg
puma (~> 3.7)
rails (~> 5.1.4)
rails_12factor
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)

View file

@ -5,21 +5,21 @@
# gem 'sqlite3'
#
default: &default
adapter: sqlite3
adapter: postgresql
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
timeout: 5000
development:
<<: *default
database: db/development.sqlite3
database: db/development.postgresql
# 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
database: db/test.postgresql
production:
<<: *default
database: db/production.sqlite3
database: db/production.postgresql