Merge branch 'master' into features/create_register_page

app/views/layouts/_menu.html.erb

@@ -12,16 +12,15 @@
       <li><a href="#"><i class="fa fa-sign-in" aria-hidden="true"></i> My Page</a></li>
       <li><a href="#"><i class="fa fa-sign-in" aria-hidden="true"></i> My Page</a></li>
       <li>
       <li>
         <%= link_to destroy_user_session_path, method: :delete do %>
         <%= link_to destroy_user_session_path, method: :delete do %>
-          <i class="fa fa-sign-out" aria-hidden="true"></i> Logout
+          <i class="fa fa-sign-out" aria-hidden="true"></i>Logout
         <% end %>
         <% end %>
       </li>
       </li>
       <%- else -%>
       <%- else -%>
-      <li><a href="<%= new_user_session_path %>"><i class="fa fa-sign-in" aria-hidden="true"></i> Login</a></li>
       <li>
       <li>
-        <%= link_to register_path(step: 1) do %>
-          <i class="fa fa-plus-circle" aria-hidden="true"></i> Register
-        <% end %>
-      </li>
+      <%= link_to new_user_session_path do %>
+        <i class="fa fa-sign-in" aria-hidden="true"></i>Signin
+      <% end %></li>
+      <li><a href="#"><i class="fa fa-plus" aria-hidden="true"></i> Register</a></li>
       <%- end -%>
       <%- end -%>
       <li><a href="#"><i class="fa fa-star" aria-hidden="true"></i></span> Favorite</a></li>
       <li><a href="#"><i class="fa fa-star" aria-hidden="true"></i></span> Favorite</a></li>
       <li><a href="#"><i class="fa fa-history" aria-hidden="true"></i></span> History</a></li>
       <li><a href="#"><i class="fa fa-history" aria-hidden="true"></i></span> History</a></li>

config/environments/development.rb

@@ -48,21 +48,16 @@ Rails.application.configure do
   # Raises error for missing translations
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
   # config.action_view.raise_on_missing_translations = true
 
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-  config.action_mailer.default_url_options = { :protocol => 'http', :host => 'localhost:3000' }
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: 'localhost',
-                                         port: 1025 }
-
-#   config.action_mailer.smtp_settings = {
-#   address: "smtp.gmail.com",
-#   port: 587,
-#   domain: "example.com",
-#   authentication: "plain",
-#   enable_starttls_auto: true,
-#   user_name: ENV["GMAIL_USER"],
-#   password: ENV["GMAIL_PASSWORD"]
-# }
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = { address: 'localhost',
+  #                                        port: 1025 }
+  config.action_mailer.smtp_settings = {
+    address: "smtp.gmail.com",
+    port: 587,
+    domain: "example.com",
+    authentication: "plain",
+    enable_starttls_auto: true,
+    user_name: ENV["GMAIL_USER"],
+    password: ENV["GMAIL_PASSWORD"]
+  }
 end
 end