Commit ef495f33 by Thanh Hung Pham

Fix merge request

parent 60733fbe
...@@ -51,11 +51,9 @@ group :development do ...@@ -51,11 +51,9 @@ group :development do
gem 'binding_of_caller' gem 'binding_of_caller'
gem 'devise' gem 'devise'
gem 'figaro' gem 'figaro'
gem 'rubyzip'
gem 'spring' gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0' gem 'spring-watcher-listen', '~> 2.0.0'
gem 'better_errors'
gem 'binding_of_caller'
gem 'rubyzip'
end end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
......
user_name
user_password
...@@ -36,8 +36,8 @@ Rails.application.configure do ...@@ -36,8 +36,8 @@ Rails.application.configure do
address: 'smtp.gmail.com', address: 'smtp.gmail.com',
port: 587, port: 587,
domain: 'zigexn.vn', domain: 'zigexn.vn',
user_name: 'hungpt@zigexn.vn', user_name: ENV['user_name'],
password: 'hung@1234567pham@', password: ENV['user_password'],
authentication: 'plain', authentication: 'plain',
enable_starttls_auto: true enable_starttls_auto: true
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment