{"action":"created","comment":{"url":"https://api.github.com/repos/annaroyer/bike_share/pulls/comments/169425488","pull_request_review_id":97937777,"id":169425488,"diff_hunk":"@@ -1,5 +1,6 @@\n FactoryBot.define do\n   factory :condition do\n+<<<<<<< HEAD","path":"spec/factories.rb","position":null,"original_position":3,"commit_id":"20ccb8c8ac7dc2bdc6de958c29f4dbe928543f75","original_commit_id":"fa8a45709a9734685fbcebdf4616e4d0df22ccc5","user":{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false},"body":"merge conflict lines still in factories","created_at":"2018-02-20T19:05:22Z","updated_at":"2018-02-20T19:10:16Z","html_url":"https://github.com/annaroyer/bike_share/pull/61#discussion_r169425488","pull_request_url":"https://api.github.com/repos/annaroyer/bike_share/pulls/61","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/comments/169425488"},"html":{"href":"https://github.com/annaroyer/bike_share/pull/61#discussion_r169425488"},"pull_request":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/61"}}},"pull_request":{"url":"https://api.github.com/repos/annaroyer/bike_share/pulls/61","id":170272164,"html_url":"https://github.com/annaroyer/bike_share/pull/61","diff_url":"https://github.com/annaroyer/bike_share/pull/61.diff","patch_url":"https://github.com/annaroyer/bike_share/pull/61.patch","issue_url":"https://api.github.com/repos/annaroyer/bike_share/issues/61","number":61,"state":"open","locked":false,"title":"M weather dash closes #25","user":{"login":"mgmilton","id":7215067,"avatar_url":"https://avatars3.githubusercontent.com/u/7215067?v=4","gravatar_id":"","url":"https://api.github.com/users/mgmilton","html_url":"https://github.com/mgmilton","followers_url":"https://api.github.com/users/mgmilton/followers","following_url":"https://api.github.com/users/mgmilton/following{/other_user}","gists_url":"https://api.github.com/users/mgmilton/gists{/gist_id}","starred_url":"https://api.github.com/users/mgmilton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mgmilton/subscriptions","organizations_url":"https://api.github.com/users/mgmilton/orgs","repos_url":"https://api.github.com/users/mgmilton/repos","events_url":"https://api.github.com/users/mgmilton/events{/privacy}","received_events_url":"https://api.github.com/users/mgmilton/received_events","type":"User","site_admin":false},"body":"<!--- General summary of changes in the Title above -->\r\n\r\nDescription of Changes:\r\n-\r\n* Adds WeatherDashboardController\r\n* Adds Index with metrics about trips per weather conditons\r\n* Updates condition factor\r\n* Adds analytics to condition model\r\n\r\n### Tests Added:\r\n* Adds class method tests for condition model\r\n* Adds feature spec for weather dashboard\r\n\r\n#### Reference Related Issue(s) or Spec Requirement:\r\n- #25 \r\n<!--- To automatically close related issue(s) on merge, put \"closes #<issue number>\" in the Title of this request -->\r\n\r\n#### Checklist:\r\n- [X] Code follows code style of this project\r\n- [X] Tests added to cover changes\r\n- [X] All new and existing tests passing\r\n#\r\n\r\n#### Questions / Additional Notes:\r\n\r\n@mgmilton @slimecog @annaroyer\r\n\r\n<!--- AliSchlereth icorson3 --->\r\n","created_at":"2018-02-20T18:26:51Z","updated_at":"2018-02-20T19:10:16Z","closed_at":null,"merged_at":null,"merge_commit_sha":"684ab1d44c44a191cfbaf6c9dffe361fb1b63664","assignee":{"login":"mgmilton","id":7215067,"avatar_url":"https://avatars3.githubusercontent.com/u/7215067?v=4","gravatar_id":"","url":"https://api.github.com/users/mgmilton","html_url":"https://github.com/mgmilton","followers_url":"https://api.github.com/users/mgmilton/followers","following_url":"https://api.github.com/users/mgmilton/following{/other_user}","gists_url":"https://api.github.com/users/mgmilton/gists{/gist_id}","starred_url":"https://api.github.com/users/mgmilton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mgmilton/subscriptions","organizations_url":"https://api.github.com/users/mgmilton/orgs","repos_url":"https://api.github.com/users/mgmilton/repos","events_url":"https://api.github.com/users/mgmilton/events{/privacy}","received_events_url":"https://api.github.com/users/mgmilton/received_events","type":"User","site_admin":false},"assignees":[{"login":"mgmilton","id":7215067,"avatar_url":"https://avatars3.githubusercontent.com/u/7215067?v=4","gravatar_id":"","url":"https://api.github.com/users/mgmilton","html_url":"https://github.com/mgmilton","followers_url":"https://api.github.com/users/mgmilton/followers","following_url":"https://api.github.com/users/mgmilton/following{/other_user}","gists_url":"https://api.github.com/users/mgmilton/gists{/gist_id}","starred_url":"https://api.github.com/users/mgmilton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mgmilton/subscriptions","organizations_url":"https://api.github.com/users/mgmilton/orgs","repos_url":"https://api.github.com/users/mgmilton/repos","events_url":"https://api.github.com/users/mgmilton/events{/privacy}","received_events_url":"https://api.github.com/users/mgmilton/received_events","type":"User","site_admin":false},{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":840201029,"url":"https://api.github.com/repos/annaroyer/bike_share/labels/in%20progress","name":"in progress","color":"ededed","default":false}],"milestone":null,"commits_url":"https://api.github.com/repos/annaroyer/bike_share/pulls/61/commits","review_comments_url":"https://api.github.com/repos/annaroyer/bike_share/pulls/61/comments","review_comment_url":"https://api.github.com/repos/annaroyer/bike_share/pulls/comments{/number}","comments_url":"https://api.github.com/repos/annaroyer/bike_share/issues/61/comments","statuses_url":"https://api.github.com/repos/annaroyer/bike_share/statuses/20ccb8c8ac7dc2bdc6de958c29f4dbe928543f75","head":{"label":"annaroyer:m_weather_dash","ref":"m_weather_dash","sha":"20ccb8c8ac7dc2bdc6de958c29f4dbe928543f75","user":{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false},"repo":{"id":121785146,"name":"bike_share","full_name":"annaroyer/bike_share","owner":{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/annaroyer/bike_share","description":null,"fork":false,"url":"https://api.github.com/repos/annaroyer/bike_share","forks_url":"https://api.github.com/repos/annaroyer/bike_share/forks","keys_url":"https://api.github.com/repos/annaroyer/bike_share/keys{/key_id}","collaborators_url":"https://api.github.com/repos/annaroyer/bike_share/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/annaroyer/bike_share/teams","hooks_url":"https://api.github.com/repos/annaroyer/bike_share/hooks","issue_events_url":"https://api.github.com/repos/annaroyer/bike_share/issues/events{/number}","events_url":"https://api.github.com/repos/annaroyer/bike_share/events","assignees_url":"https://api.github.com/repos/annaroyer/bike_share/assignees{/user}","branches_url":"https://api.github.com/repos/annaroyer/bike_share/branches{/branch}","tags_url":"https://api.github.com/repos/annaroyer/bike_share/tags","blobs_url":"https://api.github.com/repos/annaroyer/bike_share/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/annaroyer/bike_share/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/annaroyer/bike_share/git/refs{/sha}","trees_url":"https://api.github.com/repos/annaroyer/bike_share/git/trees{/sha}","statuses_url":"https://api.github.com/repos/annaroyer/bike_share/statuses/{sha}","languages_url":"https://api.github.com/repos/annaroyer/bike_share/languages","stargazers_url":"https://api.github.com/repos/annaroyer/bike_share/stargazers","contributors_url":"https://api.github.com/repos/annaroyer/bike_share/contributors","subscribers_url":"https://api.github.com/repos/annaroyer/bike_share/subscribers","subscription_url":"https://api.github.com/repos/annaroyer/bike_share/subscription","commits_url":"https://api.github.com/repos/annaroyer/bike_share/commits{/sha}","git_commits_url":"https://api.github.com/repos/annaroyer/bike_share/git/commits{/sha}","comments_url":"https://api.github.com/repos/annaroyer/bike_share/comments{/number}","issue_comment_url":"https://api.github.com/repos/annaroyer/bike_share/issues/comments{/number}","contents_url":"https://api.github.com/repos/annaroyer/bike_share/contents/{+path}","compare_url":"https://api.github.com/repos/annaroyer/bike_share/compare/{base}...{head}","merges_url":"https://api.github.com/repos/annaroyer/bike_share/merges","archive_url":"https://api.github.com/repos/annaroyer/bike_share/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/annaroyer/bike_share/downloads","issues_url":"https://api.github.com/repos/annaroyer/bike_share/issues{/number}","pulls_url":"https://api.github.com/repos/annaroyer/bike_share/pulls{/number}","milestones_url":"https://api.github.com/repos/annaroyer/bike_share/milestones{/number}","notifications_url":"https://api.github.com/repos/annaroyer/bike_share/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/annaroyer/bike_share/labels{/name}","releases_url":"https://api.github.com/repos/annaroyer/bike_share/releases{/id}","deployments_url":"https://api.github.com/repos/annaroyer/bike_share/deployments","created_at":"2018-02-16T18:24:20Z","updated_at":"2018-02-16T19:12:01Z","pushed_at":"2018-02-20T19:08:47Z","git_url":"git://github.com/annaroyer/bike_share.git","ssh_url":"git@github.com:annaroyer/bike_share.git","clone_url":"https://github.com/annaroyer/bike_share.git","svn_url":"https://github.com/annaroyer/bike_share","homepage":null,"size":12196,"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":0,"mirror_url":null,"archived":false,"open_issues_count":36,"license":null,"forks":0,"open_issues":36,"watchers":0,"default_branch":"master"}},"base":{"label":"annaroyer:master","ref":"master","sha":"8c78e974df1246f69dcefdeb9c03c2fe6a4d6cb7","user":{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false},"repo":{"id":121785146,"name":"bike_share","full_name":"annaroyer/bike_share","owner":{"login":"annaroyer","id":26782839,"avatar_url":"https://avatars0.githubusercontent.com/u/26782839?v=4","gravatar_id":"","url":"https://api.github.com/users/annaroyer","html_url":"https://github.com/annaroyer","followers_url":"https://api.github.com/users/annaroyer/followers","following_url":"https://api.github.com/users/annaroyer/following{/other_user}","gists_url":"https://api.github.com/users/annaroyer/gists{/gist_id}","starred_url":"https://api.github.com/users/annaroyer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annaroyer/subscriptions","organizations_url":"https://api.github.com/users/annaroyer/orgs","repos_url":"https://api.github.com/users/annaroyer/repos","events_url":"https://api.github.com/users/annaroyer/events{/privacy}","received_events_url":"https://api.github.com/users/annaroyer/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/annaroyer/bike_share","description":null,"fork":false,"url":"https://api.github.com/repos/annaroyer/bike_share","forks_url":"https://api.github.com/repos/annaroyer/bike_share/forks","keys_url":"https://api.github.com/repos/annaroyer/bike_share/keys{/key_id}","collaborators_url":"https://api.github.com/repos/annaroyer/bike_share/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/annaroyer/bike_share/teams","hooks_url":"https://api.github.com/repos/annaroyer/bike_share/hooks","issue_events_url":"https://api.github.com/repos/annaroyer/bike_share/issues/events{/number}","events_url":"https://api.github.com/repos/annaroyer/bike_share/events","assignees_url":"https://api.github.com/repos/annaroyer/bike_share/assignees{/user}","branches_url":"https://api.github.com/repos/annaroyer/bike_share/branches{/branch}","tags_url":"https://api.github.com/repos/annaroyer/bike_share/tags","blobs_url":"https://api.github.com/repos/annaroyer/bike_share/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/annaroyer/bike_share/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/annaroyer/bike_share/git/refs{/sha}","trees_url":"https://api.github.com/repos/annaroyer/bike_share/git/trees{/sha}","statuses_url":"https://api.github.com/repos/annaroyer/bike_share/statuses/{sha}","languages_url":"https://api.github.com/repos/annaroyer/bike_share/languages","stargazers_url":"https://api.github.com/repos/annaroyer/bike_share/stargazers","contributors_url":"https://api.github.com/repos/annaroyer/bike_share/contributors","subscribers_url":"https://api.github.com/repos/annaroyer/bike_share/subscribers","subscription_url":"https://api.github.com/repos/annaroyer/bike_share/subscription","commits_url":"https://api.github.com/repos/annaroyer/bike_share/commits{/sha}","git_commits_url":"https://api.github.com/repos/annaroyer/bike_share/git/commits{/sha}","comments_url":"https://api.github.com/repos/annaroyer/bike_share/comments{/number}","issue_comment_url":"https://api.github.com/repos/annaroyer/bike_share/issues/comments{/number}","contents_url":"https://api.github.com/repos/annaroyer/bike_share/contents/{+path}","compare_url":"https://api.github.com/repos/annaroyer/bike_share/compare/{base}...{head}","merges_url":"https://api.github.com/repos/annaroyer/bike_share/merges","archive_url":"https://api.github.com/repos/annaroyer/bike_share/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/annaroyer/bike_share/downloads","issues_url":"https://api.github.com/repos/annaroyer/bike_share/issues{/number}","pulls_url":"https://api.github.com/repos/annaroyer/bike_share/pulls{/number}","milestones_url":"https://api.github.com/repos/annaroyer/bike_share/milestones{/number}","notifications_url":"https://api.github.com/repos/annaroyer/bike_share/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/annaroyer/bike_share/labels{/name}","releases_url":"https://api.github.com/repos/annaroyer/bike_share/releases{/id}","deployments_url":"https://api.github.com/repos/annaroyer/bike_share/deployments","created_at":"2018-02-16T18:24:20Z","updated_at":"2018-02-16T19:12:01Z","pushed_at":"2018-02-20T19:08:47Z","git_url":"git://github.com/annaroyer/bike_share.git","ssh_url":"git@github.com:annaroyer/bike_share.git","clone_url":"https://github.com/annaroyer/bike_share.git","svn_url":"https://github.com/annaroyer/bike_share","homepage":null,"size":12196,"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":0,"mirror_url":null,"archived":false,"open_issues_count":36,"license":null,"forks":0,"open_issues":36,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/61"},"html":{"href":"https://github.com/annaroyer/bike_share/pull/61"},"issue":{"href":"https://api.github.com/repos/annaroyer/bike_share/issues/61"},"comments":{"href":"https://api.github.com/repos/annaroyer/bike_share/issues/61/comments"},"review_comments":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/61/comments"},"review_comment":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/annaroyer/bike_share/pulls/61/commits"},"statuses":{"href":"https://api.github.com/repos/annaroyer/bike_share/statuses/20ccb8c8ac7dc2bdc6de958c29f4dbe928543f75"}},"author_association":"COLLABORATOR"}}
{"actor":{"display_login":"annaroyer"}}