Skip to content
New issue

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

#

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

Already on GitHub? # to your account

ENV vars cleanup #417

Merged
merged 3 commits into from
Sep 4, 2018
Merged

ENV vars cleanup #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
285617f
`.env.example` cleanup (remove unused vars) and dotenv-rails upgrade
markets Aug 31, 2018
94acd09
:scissors: config/newrelic.yml, we are using Skylight now
markets Aug 15, 2018
d2eae50
:scissors: unused app/inputs/* (old simple_form overrides)
markets Aug 31, 2018
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
4 changes: 2 additions & 2 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@


# database setup:
DATABASE_ADAPTER=postgres
DATABASE_USER=postgres
DATABASE_HOST=localhost
DATABASE_NAME=timeoverflow_development

# host part of the url for mail links:
MAIL_LINK_HOST=localhost:3000
MAIL_LINK_PROTO=http

# a list of emails for superadmin users
ADMINS="admin@timeoverflow.org"
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :development do
gem 'airbrussh', require: false
gem 'localeapp', '2.1.1', require: false
gem 'letter_opener', '1.4.1'
gem 'dotenv-rails', '1.0.2'
gem 'dotenv-rails', '2.5.0'
end

group :development, :test do
Expand Down
9 changes: 5 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ GEM
diff-lcs (1.3)
domain_name (0.5.20170223)
unf (>= 0.0.5, < 1.0.0)
dotenv (1.0.2)
dotenv-rails (1.0.2)
dotenv (= 1.0.2)
dotenv (2.5.0)
dotenv-rails (2.5.0)
dotenv (= 2.5.0)
railties (>= 3.2, < 6.0)
elasticsearch (1.0.8)
elasticsearch-api (= 1.0.7)
elasticsearch-transport (= 1.0.7)
Expand Down Expand Up @@ -412,7 +413,7 @@ DEPENDENCIES
dalli
database_cleaner (= 1.6.2)
devise (~> 4.4.1)
dotenv-rails (= 1.0.2)
dotenv-rails (= 2.5.0)
elasticsearch-model
elasticsearch-rails
fabrication
Expand Down
5 changes: 0 additions & 5 deletions app/inputs/collection_select2_input.rb
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions app/inputs/datepicker_input.rb
View file
Open in desktop

This file was deleted.

255 changes: 0 additions & 255 deletions config/newrelic.yml
View file
Open in desktop

This file was deleted.