{"action":"created","comment":{"url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/comments/174690101","pull_request_review_id":104090020,"id":174690101,"diff_hunk":"@@ -44,13 +45,21 @@\n       .box_user_selected.ng-hide\n         .user_selected_list\n       .box_list_view_user\n+        %ul.list_view_users\n+          / = render partial: \"pairs/shared/list_view_user_item\" ユーザーのテンプレ\n         %ul.list_view_users.clearfix\n           %li.list_view_user_item\n             %div\n               %div\n                 %div\n+<<<<<<< HEAD\n+                  = link_to \"\", class: \"showPersonalViewModal\" do\n+                    = image_tag \"https://lh3.googleusercontent.com/F90t0RCwPpsxLWHuAxZxJntagAbCLW20BgcY44mljphwTgtAN1C3Df8pIwqLKfkN0AywfjMmmTTyTjwuY6q_bqU5bWxo33M0j7VJPVbercsR12fQrwzaLlkojLk_wnjlmujkFGE5A290fnIWGAl7rp-vdQGjrEX6tXjvKhcBXmUutoUl9VgQlqZx3WKx-W91Y0pNqMfQzOn_gv2A9wC6HBx5qKvkekSdkJ8cGXhWffyeOI1XDX2WP3QcO5DaSxB4ZE76djSDnJfkimvHDbpG_B8uJE1sN6YWr5IYnSr_lCkMQbdyRGsVUceYrvfwfRTri_G28az4FRx2_cvdg7FnWJ5Gf6ltwJJXhai4LLkVXyCSbAo8k6D_0kHloFHdWOPnT8vL0ZttvEiCxQe4sZj70Mv3nsmIYUFRj4oQJd6Ff1cVsgYG7o4oYopdN82eYUFouN4cHVnpX1bmne1dmC16AiW4VKwo6DlqYwoaMWh4EUn1YzGPZxQqCqgRZSmEm2ewsgNKZzv-TlGAI5570jD5ny52SiKZtDlm5JdN_aSHGYPcuOxpW2TB4kekudPFTu38Lq3n4BDWvuZJ-e8zIzzBtAiHfwASNJMHxLDbOh2KWnlfe0E0e7l4vRsFJ22tweL4hKCNeIdU9rsXzVl3-kcwKqMSi4XZwgqV=w204-h247-no\", class: \"list_view_user_photo image-circle\", height: \"152\", width: \"152\"\n+=======\n                   %a.showPersonalViewModal\n+                    %img.list_view_user_photo.image-circle{height: \"152\", src: \"https://lh3.googleusercontent.com/F90t0RCwPpsxLWHuAxZxJntagAbCLW20BgcY44mljphwTgtAN1C3Df8pIwqLKfkN0AywfjMmmTTyTjwuY6q_bqU5bWxo33M0j7VJPVbercsR12fQrwzaLlkojLk_wnjlmujkFGE5A290fnIWGAl7rp-vdQGjrEX6tXjvKhcBXmUutoUl9VgQlqZx3WKx-W91Y0pNqMfQzOn_gv2A9wC6HBx5qKvkekSdkJ8cGXhWffyeOI1XDX2WP3QcO5DaSxB4ZE76djSDnJfkimvHDbpG_B8uJE1sN6YWr5IYnSr_lCkMQbdyRGsVUceYrvfwfRTri_G28az4FRx2_cvdg7FnWJ5Gf6ltwJJXhai4LLkVXyCSbAo8k6D_0kHloFHdWOPnT8vL0ZttvEiCxQe4sZj70Mv3nsmIYUFRj4oQJd6Ff1cVsgYG7o4oYopdN82eYUFouN4cHVnpX1bmne1dmC16AiW4VKwo6DlqYwoaMWh4EUn1YzGPZxQqCqgRZSmEm2ewsgNKZzv-TlGAI5570jD5ny52SiKZtDlm5JdN_aSHGYPcuOxpW2TB4kekudPFTu38Lq3n4BDWvuZJ-e8zIzzBtAiHfwASNJMHxLDbOh2KWnlfe0E0e7l4vRsFJ22tweL4hKCNeIdU9rsXzVl3-kcwKqMSi4XZwgqV=w204-h247-no\", width: \"152\"}/","path":"app/views/pairs/shared/_main_contents.html.haml","position":36,"original_position":36,"commit_id":"27f2d0a7cb0670252dc48d0c46b7d24069a987a3","original_commit_id":"27f2d0a7cb0670252dc48d0c46b7d24069a987a3","user":{"login":"YukiYanagikubo","id":36324459,"avatar_url":"https://avatars1.githubusercontent.com/u/36324459?v=4","gravatar_id":"","url":"https://api.github.com/users/YukiYanagikubo","html_url":"https://github.com/YukiYanagikubo","followers_url":"https://api.github.com/users/YukiYanagikubo/followers","following_url":"https://api.github.com/users/YukiYanagikubo/following{/other_user}","gists_url":"https://api.github.com/users/YukiYanagikubo/gists{/gist_id}","starred_url":"https://api.github.com/users/YukiYanagikubo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/YukiYanagikubo/subscriptions","organizations_url":"https://api.github.com/users/YukiYanagikubo/orgs","repos_url":"https://api.github.com/users/YukiYanagikubo/repos","events_url":"https://api.github.com/users/YukiYanagikubo/events{/privacy}","received_events_url":"https://api.github.com/users/YukiYanagikubo/received_events","type":"User","site_admin":false},"body":"ユーザーは部分テンプレートを作成しており、サンプルのユーザーは1人を残して削除しました。\r\ncssも不都合があるところ以外はcssファイルに記述しました。","created_at":"2018-03-15T06:51:48Z","updated_at":"2018-03-15T06:51:48Z","html_url":"https://github.com/eco1885/pairs_team-a/pull/24#discussion_r174690101","pull_request_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/comments/174690101"},"html":{"href":"https://github.com/eco1885/pairs_team-a/pull/24#discussion_r174690101"},"pull_request":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24"}},"in_reply_to_id":174667144},"pull_request":{"url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24","id":174627335,"html_url":"https://github.com/eco1885/pairs_team-a/pull/24","diff_url":"https://github.com/eco1885/pairs_team-a/pull/24.diff","patch_url":"https://github.com/eco1885/pairs_team-a/pull/24.patch","issue_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/24","number":24,"state":"open","locked":false,"title":"トップviewのmain_contentsの作成","user":{"login":"YukiYanagikubo","id":36324459,"avatar_url":"https://avatars1.githubusercontent.com/u/36324459?v=4","gravatar_id":"","url":"https://api.github.com/users/YukiYanagikubo","html_url":"https://github.com/YukiYanagikubo","followers_url":"https://api.github.com/users/YukiYanagikubo/followers","following_url":"https://api.github.com/users/YukiYanagikubo/following{/other_user}","gists_url":"https://api.github.com/users/YukiYanagikubo/gists{/gist_id}","starred_url":"https://api.github.com/users/YukiYanagikubo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/YukiYanagikubo/subscriptions","organizations_url":"https://api.github.com/users/YukiYanagikubo/orgs","repos_url":"https://api.github.com/users/YukiYanagikubo/repos","events_url":"https://api.github.com/users/YukiYanagikubo/events{/privacy}","received_events_url":"https://api.github.com/users/YukiYanagikubo/received_events","type":"User","site_admin":false},"body":"#what\r\nトップviewのmain_contentsの作成\r\n\r\n#why\r\n必須機能のため\r\n\r\n![screencapture-localhost-3000-2018-03-13-20_49_32](https://user-images.githubusercontent.com/36324459/37340053-1d197b6a-2700-11e8-90fd-7dfca156a720.png)\r\n","created_at":"2018-03-13T11:15:12Z","updated_at":"2018-03-15T06:51:48Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a8b3fef4fa3f3c4b2dee547cce6b79340c6f8fd9","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24/commits","review_comments_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24/comments","review_comment_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/comments{/number}","comments_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/24/comments","statuses_url":"https://api.github.com/repos/eco1885/pairs_team-a/statuses/27f2d0a7cb0670252dc48d0c46b7d24069a987a3","head":{"label":"eco1885:top_view_maincontents_create","ref":"top_view_maincontents_create","sha":"27f2d0a7cb0670252dc48d0c46b7d24069a987a3","user":{"login":"eco1885","id":36178714,"avatar_url":"https://avatars2.githubusercontent.com/u/36178714?v=4","gravatar_id":"","url":"https://api.github.com/users/eco1885","html_url":"https://github.com/eco1885","followers_url":"https://api.github.com/users/eco1885/followers","following_url":"https://api.github.com/users/eco1885/following{/other_user}","gists_url":"https://api.github.com/users/eco1885/gists{/gist_id}","starred_url":"https://api.github.com/users/eco1885/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eco1885/subscriptions","organizations_url":"https://api.github.com/users/eco1885/orgs","repos_url":"https://api.github.com/users/eco1885/repos","events_url":"https://api.github.com/users/eco1885/events{/privacy}","received_events_url":"https://api.github.com/users/eco1885/received_events","type":"User","site_admin":false},"repo":{"id":124045646,"name":"pairs_team-a","full_name":"eco1885/pairs_team-a","owner":{"login":"eco1885","id":36178714,"avatar_url":"https://avatars2.githubusercontent.com/u/36178714?v=4","gravatar_id":"","url":"https://api.github.com/users/eco1885","html_url":"https://github.com/eco1885","followers_url":"https://api.github.com/users/eco1885/followers","following_url":"https://api.github.com/users/eco1885/following{/other_user}","gists_url":"https://api.github.com/users/eco1885/gists{/gist_id}","starred_url":"https://api.github.com/users/eco1885/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eco1885/subscriptions","organizations_url":"https://api.github.com/users/eco1885/orgs","repos_url":"https://api.github.com/users/eco1885/repos","events_url":"https://api.github.com/users/eco1885/events{/privacy}","received_events_url":"https://api.github.com/users/eco1885/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/eco1885/pairs_team-a","description":null,"fork":false,"url":"https://api.github.com/repos/eco1885/pairs_team-a","forks_url":"https://api.github.com/repos/eco1885/pairs_team-a/forks","keys_url":"https://api.github.com/repos/eco1885/pairs_team-a/keys{/key_id}","collaborators_url":"https://api.github.com/repos/eco1885/pairs_team-a/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/eco1885/pairs_team-a/teams","hooks_url":"https://api.github.com/repos/eco1885/pairs_team-a/hooks","issue_events_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/events{/number}","events_url":"https://api.github.com/repos/eco1885/pairs_team-a/events","assignees_url":"https://api.github.com/repos/eco1885/pairs_team-a/assignees{/user}","branches_url":"https://api.github.com/repos/eco1885/pairs_team-a/branches{/branch}","tags_url":"https://api.github.com/repos/eco1885/pairs_team-a/tags","blobs_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/refs{/sha}","trees_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/trees{/sha}","statuses_url":"https://api.github.com/repos/eco1885/pairs_team-a/statuses/{sha}","languages_url":"https://api.github.com/repos/eco1885/pairs_team-a/languages","stargazers_url":"https://api.github.com/repos/eco1885/pairs_team-a/stargazers","contributors_url":"https://api.github.com/repos/eco1885/pairs_team-a/contributors","subscribers_url":"https://api.github.com/repos/eco1885/pairs_team-a/subscribers","subscription_url":"https://api.github.com/repos/eco1885/pairs_team-a/subscription","commits_url":"https://api.github.com/repos/eco1885/pairs_team-a/commits{/sha}","git_commits_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/commits{/sha}","comments_url":"https://api.github.com/repos/eco1885/pairs_team-a/comments{/number}","issue_comment_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/comments{/number}","contents_url":"https://api.github.com/repos/eco1885/pairs_team-a/contents/{+path}","compare_url":"https://api.github.com/repos/eco1885/pairs_team-a/compare/{base}...{head}","merges_url":"https://api.github.com/repos/eco1885/pairs_team-a/merges","archive_url":"https://api.github.com/repos/eco1885/pairs_team-a/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/eco1885/pairs_team-a/downloads","issues_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues{/number}","pulls_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls{/number}","milestones_url":"https://api.github.com/repos/eco1885/pairs_team-a/milestones{/number}","notifications_url":"https://api.github.com/repos/eco1885/pairs_team-a/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/eco1885/pairs_team-a/labels{/name}","releases_url":"https://api.github.com/repos/eco1885/pairs_team-a/releases{/id}","deployments_url":"https://api.github.com/repos/eco1885/pairs_team-a/deployments","created_at":"2018-03-06T08:26:35Z","updated_at":"2018-03-15T06:48:19Z","pushed_at":"2018-03-15T06:48:22Z","git_url":"git://github.com/eco1885/pairs_team-a.git","ssh_url":"git@github.com:eco1885/pairs_team-a.git","clone_url":"https://github.com/eco1885/pairs_team-a.git","svn_url":"https://github.com/eco1885/pairs_team-a","homepage":null,"size":433,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"open_issues_count":2,"license":null,"forks":1,"open_issues":2,"watchers":0,"default_branch":"master"}},"base":{"label":"eco1885:master","ref":"master","sha":"caa859fa7d7fd5ef27e7b0999f4b92ab644fbfac","user":{"login":"eco1885","id":36178714,"avatar_url":"https://avatars2.githubusercontent.com/u/36178714?v=4","gravatar_id":"","url":"https://api.github.com/users/eco1885","html_url":"https://github.com/eco1885","followers_url":"https://api.github.com/users/eco1885/followers","following_url":"https://api.github.com/users/eco1885/following{/other_user}","gists_url":"https://api.github.com/users/eco1885/gists{/gist_id}","starred_url":"https://api.github.com/users/eco1885/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eco1885/subscriptions","organizations_url":"https://api.github.com/users/eco1885/orgs","repos_url":"https://api.github.com/users/eco1885/repos","events_url":"https://api.github.com/users/eco1885/events{/privacy}","received_events_url":"https://api.github.com/users/eco1885/received_events","type":"User","site_admin":false},"repo":{"id":124045646,"name":"pairs_team-a","full_name":"eco1885/pairs_team-a","owner":{"login":"eco1885","id":36178714,"avatar_url":"https://avatars2.githubusercontent.com/u/36178714?v=4","gravatar_id":"","url":"https://api.github.com/users/eco1885","html_url":"https://github.com/eco1885","followers_url":"https://api.github.com/users/eco1885/followers","following_url":"https://api.github.com/users/eco1885/following{/other_user}","gists_url":"https://api.github.com/users/eco1885/gists{/gist_id}","starred_url":"https://api.github.com/users/eco1885/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eco1885/subscriptions","organizations_url":"https://api.github.com/users/eco1885/orgs","repos_url":"https://api.github.com/users/eco1885/repos","events_url":"https://api.github.com/users/eco1885/events{/privacy}","received_events_url":"https://api.github.com/users/eco1885/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/eco1885/pairs_team-a","description":null,"fork":false,"url":"https://api.github.com/repos/eco1885/pairs_team-a","forks_url":"https://api.github.com/repos/eco1885/pairs_team-a/forks","keys_url":"https://api.github.com/repos/eco1885/pairs_team-a/keys{/key_id}","collaborators_url":"https://api.github.com/repos/eco1885/pairs_team-a/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/eco1885/pairs_team-a/teams","hooks_url":"https://api.github.com/repos/eco1885/pairs_team-a/hooks","issue_events_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/events{/number}","events_url":"https://api.github.com/repos/eco1885/pairs_team-a/events","assignees_url":"https://api.github.com/repos/eco1885/pairs_team-a/assignees{/user}","branches_url":"https://api.github.com/repos/eco1885/pairs_team-a/branches{/branch}","tags_url":"https://api.github.com/repos/eco1885/pairs_team-a/tags","blobs_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/refs{/sha}","trees_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/trees{/sha}","statuses_url":"https://api.github.com/repos/eco1885/pairs_team-a/statuses/{sha}","languages_url":"https://api.github.com/repos/eco1885/pairs_team-a/languages","stargazers_url":"https://api.github.com/repos/eco1885/pairs_team-a/stargazers","contributors_url":"https://api.github.com/repos/eco1885/pairs_team-a/contributors","subscribers_url":"https://api.github.com/repos/eco1885/pairs_team-a/subscribers","subscription_url":"https://api.github.com/repos/eco1885/pairs_team-a/subscription","commits_url":"https://api.github.com/repos/eco1885/pairs_team-a/commits{/sha}","git_commits_url":"https://api.github.com/repos/eco1885/pairs_team-a/git/commits{/sha}","comments_url":"https://api.github.com/repos/eco1885/pairs_team-a/comments{/number}","issue_comment_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues/comments{/number}","contents_url":"https://api.github.com/repos/eco1885/pairs_team-a/contents/{+path}","compare_url":"https://api.github.com/repos/eco1885/pairs_team-a/compare/{base}...{head}","merges_url":"https://api.github.com/repos/eco1885/pairs_team-a/merges","archive_url":"https://api.github.com/repos/eco1885/pairs_team-a/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/eco1885/pairs_team-a/downloads","issues_url":"https://api.github.com/repos/eco1885/pairs_team-a/issues{/number}","pulls_url":"https://api.github.com/repos/eco1885/pairs_team-a/pulls{/number}","milestones_url":"https://api.github.com/repos/eco1885/pairs_team-a/milestones{/number}","notifications_url":"https://api.github.com/repos/eco1885/pairs_team-a/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/eco1885/pairs_team-a/labels{/name}","releases_url":"https://api.github.com/repos/eco1885/pairs_team-a/releases{/id}","deployments_url":"https://api.github.com/repos/eco1885/pairs_team-a/deployments","created_at":"2018-03-06T08:26:35Z","updated_at":"2018-03-15T06:48:19Z","pushed_at":"2018-03-15T06:48:22Z","git_url":"git://github.com/eco1885/pairs_team-a.git","ssh_url":"git@github.com:eco1885/pairs_team-a.git","clone_url":"https://github.com/eco1885/pairs_team-a.git","svn_url":"https://github.com/eco1885/pairs_team-a","homepage":null,"size":433,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"open_issues_count":2,"license":null,"forks":1,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24"},"html":{"href":"https://github.com/eco1885/pairs_team-a/pull/24"},"issue":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/issues/24"},"comments":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/issues/24/comments"},"review_comments":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24/comments"},"review_comment":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/pulls/24/commits"},"statuses":{"href":"https://api.github.com/repos/eco1885/pairs_team-a/statuses/27f2d0a7cb0670252dc48d0c46b7d24069a987a3"}},"author_association":"COLLABORATOR"}}
{"actor":{"display_login":"YukiYanagikubo"}}