@@ -5,6 +5,7 @@ ruby '2.6.0'
gem 'rails', '~> 5.2.2'
gem 'pg'
+gem 'haml'
gem 'puma', '~> 3.11'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
@@ -79,6 +79,9 @@ GEM
ffi (1.9.25)
globalid (0.4.1)
activesupport (>= 4.2.0)
+ haml (5.0.4)
+ temple (>= 0.8.0)
+ tilt
i18n (1.3.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
@@ -106,6 +109,7 @@ GEM
nio4r (2.3.1)
nokogiri (1.9.1)
mini_portile2 (~> 2.4.0)
+ pg (1.1.3)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
@@ -168,7 +172,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sqlite3 (1.3.13)
+ temple (0.8.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
@@ -199,15 +203,16 @@ DEPENDENCIES
capybara (>= 2.15)
chromedriver-helper
coffee-rails (~> 4.2)
+ haml
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
+ pg
puma (~> 3.11)
rails (~> 5.2.2)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
- sqlite3
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
@@ -1,5 +1,6 @@
default: &default
adapter: postgresql
+ user: pokemon_trade
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
timeout: 5000
@@ -16,4 +17,4 @@ test:
production:
<<: *default
- database: pokemon_trade
+ database: pokemon_trade_prod