Skip to content

Commit

Permalink
Configure gitignore, database, gemspec
Browse files Browse the repository at this point in the history
  • Loading branch information
rreinhardt9 committed Apr 23, 2020
1 parent 9394ed5 commit 3f98190
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ log/*.log
pkg/
test/dummy/log/*.log
test/dummy/tmp/
vendor/bundle/
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
demux (0.1.0)
rails (~> 6.0.2, >= 6.0.2.2)
rails (~> 6.0, >= 5.1)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion demux.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|

spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]

spec.add_dependency "rails", "< 6", ">= 5.1"
spec.add_dependency "rails", "~> 6.0", ">= 5.1"

spec.add_development_dependency "pg"
end
6 changes: 4 additions & 2 deletions test/dummy/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
#
default: &default
adapter: postgresql
host: localhost
username: postgres
encoding: unicode
# For details on connection pooling, see Rails configuration guide
# https://guides.rubyonrails.org/configuring.html#database-pooling
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

development:
<<: *default
database: dummy_development
database: demux_dummy_development

# The specified database role being used to connect to postgres.
# To create additional roles in postgres see `$ createuser --help`.
Expand Down Expand Up @@ -57,7 +59,7 @@ development:
# Do not set this db to the same as development or production.
test:
<<: *default
database: dummy_test
database: demux_dummy_test

# As with config/credentials.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
Expand Down

0 comments on commit 3f98190

Please sign in to comment.