Merge branch 'master' into hungpt_jobs

Gemfile

@@ -52,6 +52,7 @@ 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 'will_paginate', '3.1.5'
   gem 'will_paginate', '3.1.5'

app/assets/stylesheets/custom.scss

@@ -16,6 +16,13 @@ footer {
   }
   }
 }
 }
 
 
+input {
+  border: 1px solid $bbb;
+  height: auto;
+  margin-bottom: 15px;
+  width: 100%;
+}
+
 .navbar-inverse {
 .navbar-inverse {
   background-color: $eee;
   background-color: $eee;
   border-color: $color888;
   border-color: $color888;

config/application.yml.key

+USER_NAME
+USER_PASSWORD

config/environments/development.rb

@@ -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',
-    password: 'hung@1234567pham@',
+    user_name: ENV['USER_NAME'],
+    password: ENV['USER_PASSWORD'],
     authentication: 'plain',
     authentication: 'plain',
     enable_starttls_auto: true
     enable_starttls_auto: true
   }
   }