File tree Expand file tree Collapse file tree 3 files changed +15
-2
lines changed Expand file tree Collapse file tree 3 files changed +15
-2
lines changed Original file line number Diff line number Diff line change 15
15
/tmp
16
16
17
17
config /database.yml
18
+ config /config.yml
18
19
* .swp
19
20
public /assets /
20
21
Original file line number Diff line number Diff line change 9
9
require "sprockets/railtie"
10
10
# require "rails/test_unit/railtie"
11
11
12
+ $config = { }
13
+ config_file = "config/config.yml"
14
+ $config = YAML . load_file ( config_file ) [ Rails . env ] if File . exists? ( config_file )
15
+
12
16
if defined? ( Bundler )
13
17
# If you precompile assets before deploying to production, use this line
14
18
Bundler . require ( *Rails . groups ( :assets => %w( development test ) ) )
@@ -79,8 +83,8 @@ class Application < Rails::Application
79
83
port : 587 ,
80
84
authentication : "plain" ,
81
85
enable_starttls_auto : true ,
82
- user_name : ENV [ "OFLUNCH_GMAIL_USERNAME" ] ,
83
- password : ENV [ "OFLUNCH_GMAIL_PASSWORD" ]
86
+ user_name : $config [ 'mail_username' ] ,
87
+ password : $config [ 'mail_password' ] ,
84
88
}
85
89
config . action_mailer . default_url_options = { host : "10.64.17.47" }
86
90
end
Original file line number Diff line number Diff line change
1
+ common: &common
2
+ mail_username: hello
3
+ mail_password: world
4
+
5
+ production:
6
+ <<: *common
7
+ development:
8
+ <<: *common
You can’t perform that action at this time.
0 commit comments