Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert database.yml to previous state #725

Merged
merged 6 commits into from
Jun 27, 2019
Merged

Revert database.yml to previous state #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3e7429
Fix database.yml for test environment for unstable
kaustubh-nair Jun 19, 2019
36162fe
Update database.yml.example
kaustubh-nair Jun 19, 2019
c39168a
Revert database.yml
kaustubh-nair Jun 22, 2019
a32bd02
Update database.yml.example
kaustubh-nair Jun 25, 2019
df95f15
Using correct config for database.yml
alaxalves Jun 25, 2019
08b6de8
Merge branch 'kaustubh-nair-patch-3' of https://github.com/publiclab/…
alaxalves Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions config/database.yml.cloud9.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
default: &default
encoding: utf8
adapter: mysql2
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

development:
<<: *default
username: root
password:
database: mapknitter
username:
password:
database: mapknitter_dev

production:
<<: *default
adapter: mysql2
encoding: utf8
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
host: db
username: mapknitter
password: mapknitter
database: mapknitter

test:
<<: *default
username: root
password:
database: mapknittertest
username:
password:
database: mapknitter_test
18 changes: 12 additions & 6 deletions config/database.yml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
default: &default
encoding: utf8
adapter: mysql2
host: 127.0.0.1
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

development:
<<: *default
username:
password:
database: mapknitter-dev
username:
password:
database: mapknitter_dev

production:
<<: *default
adapter: mysql2
encoding: utf8
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
host: db
username: mapknitter
password: mapknitter
database: mapknitter

test:
<<: *default
username: root
database: mapknitter-test
username:
password:
database: mapknitter_test