d9a056acc2
commitdafa6e9377Author: Scott Miller <scott.miller.utah@gmail.com> Date: Fri Jan 22 09:53:53 2016 -0700 Added digital ocean database.yml and vendored all gems commita5b28f9e25Author: Scott Miller <scott.miller.utah@gmail.com> Date: Thu Jan 21 14:08:25 2016 -0700 Update GEMFILE commit1d0f43126fMerge:623cc94a91d09fAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Thu Jan 21 14:06:09 2016 -0700 Merge branch 'jtkendall-feature/ruser-3.x-support' # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. commita91d09fe83Merge:623cc94446c495Author: Scott Miller <scott.miller.utah@gmail.com> Date: Thu Jan 21 14:00:22 2016 -0700 Merge branch 'feature/ruser-3.x-support' of https://github.com/jtkendall/helpy into jtkendall-feature/ruser-3.x-support Conflicts: Gemfile.lock commit623cc94077Merge:d172d0ed867627Author: Scott Miller <scott.miller.utah@gmail.com> Date: Thu Jan 21 13:55:01 2016 -0700 Merge branch Conflicts: Gemfile.lock commitd172d0ec3dAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Thu Jan 21 11:58:11 2016 -0700 . commitd867627154Author: Scott Miller <scott.miller.utah@gmail.com> Date: Wed Jan 20 17:54:31 2016 -0700 Fixed search formatting commit7cefade4f4Author: Scott Miller <scott.miller.utah@gmail.com> Date: Wed Jan 20 17:54:13 2016 -0700 Ran Bundle Update commitac85437d82Author: Scott Miller <scott.miller.utah@gmail.com> Date: Wed Jan 20 17:00:45 2016 -0700 Update rails_config commit528f86559fAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Wed Jan 20 14:46:04 2016 -0700 Trying to update to 4.2.5 commit446c49514eAuthor: Josh Kendall <me@joshuakendall.com> Date: Mon Jan 18 20:50:33 2016 -0500 Support for RUser 3.0.0 commitccd56ce7a3Author: Scott Miller <scott.miller.utah@gmail.com> Date: Mon Jan 18 16:23:52 2016 -0700 Update all translation files with new keys commit6adb64ffaaAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Sat Jan 16 11:54:17 2016 -0700 Moved mail config to settings variables, added gems for other providers commitd164ff0833Author: Scott Miller <scott.miller.utah@gmail.com> Date: Mon Jan 11 17:02:40 2016 -0700 Fixed bug which caused spam messages to still be visible on main site commit3c18678995Author: Scott Miller <scott.miller.utah@gmail.com> Date: Tue Dec 29 20:54:48 2015 -0700 Fixed bug which caused post ordering to be incorrect sometimes commit59d09c1ec5Author: Scott Miller <scott.miller.utah@gmail.com> Date: Sun Dec 27 14:52:03 2015 -0700 Used wrong key for send grid api commitd3ae402f12Author: Scott Miller <scott.miller.utah@gmail.com> Date: Sun Dec 27 14:51:37 2015 -0700 Fixes 27 commit7d3d2a2457Merge:bdc29b29952c63Author: Scott Miller <scott.miller.utah@gmail.com> Date: Sat Dec 26 15:18:37 2015 -0700 Merge branch 'master' of https://github.com/scott/cheatsheet_helpdesk commitbdc29b22eeAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Sat Dec 26 15:17:48 2015 -0700 Remove mandrill, switch to sendgrid Signed-off-by: Scott Miller <scott.miller.utah@gmail.com> commitd3f4c817c6Author: Scott Miller <scott.miller.utah@gmail.com> Date: Sat Dec 26 15:17:07 2015 -0700 Add Version to footer Signed-off-by: Scott Miller <scott.miller.utah@gmail.com> commit9952c63972Author: Scott Miller <scott.miller.utah@gmail.com> Date: Sat Dec 12 09:58:17 2015 -0700 Update README.md commit17de9c3b7cAuthor: Scott Miller <scott.miller.utah@gmail.com> Date: Fri Dec 11 19:54:32 2015 -0700 Update README.md commitf3c91a5567Author: Scott Miller <scott.miller.utah@gmail.com> Date: Fri Dec 11 19:40:26 2015 -0700 Fixes #25, adds icons showing translation status to docs and categories admin views Signed-off-by: Scott Miller <scott.miller.utah@gmail.com>
26 lines
639 B
YAML
26 lines
639 B
YAML
# This file is configured for the Digital Ocean install described at
|
|
# http://support.helpy.io/en/knowledgebase/11-Installing-Helpy/docs/1-Installing-Helpy-on-Digital-Ocean
|
|
|
|
default: &default
|
|
adapter: postgresql
|
|
encoding: unicode
|
|
# For details on connection pooling, see rails configuration guide
|
|
# http://guides.rubyonrails.org/configuring.html#database-pooling
|
|
pool: 5
|
|
|
|
development:
|
|
<<: *default
|
|
database: helpy_development
|
|
port: 5432
|
|
host: localhost
|
|
|
|
test:
|
|
<<: *default
|
|
database: helpy_test
|
|
|
|
production:
|
|
<<: *default
|
|
database: helpy_production
|
|
username: rails
|
|
password: <%= ENV['APP_DATABASE_PASSWORD'] %>
|