Đường Sỹ Hoàng · @hoangds · Son Do Hong · Đường Sỹ Hoàng · Son Do Hong · Đường Sỹ Hoàng
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
 class ApplicationController < ActionController::Base
  protect_from_forgery with: :exception
  include SessionsHelper
+
+  private
+
+    # Confirms a logged-in user.
+    def logged_in_user
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb

  def show
    @user = User.find(params[:id])
+<<<<<<< HEAD
--- a/app/models/relationship.rb 0 → 100644
+++ b/app/models/relationship.rb 0 → 100644
+class Relationship < ApplicationRecord
+  belongs_to :follower, class_name: "User"
+  belongs_to :followed, class_name: "User"
+  
+  validates :follower_id, presence: true
+  validates :followed_id, presence: true
+
--- a/app/models/user.rb
+++ b/app/models/user.rb
  # Defines a proto-feed.
  # See "Following users" for the full implementation.
  def feed
-    Micropost.where("user_id = ?", id)
+    following_ids = "SELECT followed_id FROM relationships
--- a/app/models/user.rb
+++ b/app/models/user.rb
  # Defines a proto-feed.
  # See "Following users" for the full implementation.
  def feed
-    Micropost.where("user_id = ?", id)
+    following_ids = "SELECT followed_id FROM relationships
+                                WHERE follower_id = :user_id"
+    Micropost.where("user_id IN (#{following_ids})
+                                  OR user_id = :user_id", user_id: id)
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb

 <div class="row">
  <div class="col-md-6 col-md-offset-3">
+<<<<<<< HEAD
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
 <div class="row">
  <div class="col-md-6 col-md-offset-3">
    <%= render "form" %>
-    <div class="gravatar_edit">
-      <%= gravatar_for @user %>
-      <a href="http://gravatar.com/emails">change</a>
+  <div class="gravatar_edit">