GitHub PullRequestReviewCommentEvent at 2014-11-09 21:37:46
Repository: live-editor
Actor: pamelafox
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/Khan/live-editor/pulls/comments/20061659","id":20061659,"diff_hunk":"@@ -1,3 +1,5 @@\n+<<<<<<< HEAD","path":"build/css/live-editor.ui.css","position":1,"original_position":1,"commit_id":"7469a2fe7785edd920f4862e2e40fc3244605141","original_commit_id":"7469a2fe7785edd920f4862e2e40fc3244605141","user":{"login":"pamelafox","id":297042,"avatar_url":"https://avatars.githubusercontent.com/u/297042?v=3","gravatar_id":"","url":"https://api.github.com/users/pamelafox","html_url":"https://github.com/pamelafox","followers_url":"https://api.github.com/users/pamelafox/followers","following_url":"https://api.github.com/users/pamelafox/following{/other_user}","gists_url":"https://api.github.com/users/pamelafox/gists{/gist_id}","starred_url":"https://api.github.com/users/pamelafox/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pamelafox/subscriptions","organizations_url":"https://api.github.com/users/pamelafox/orgs","repos_url":"https://api.github.com/users/pamelafox/repos","events_url":"https://api.github.com/users/pamelafox/events{/privacy}","received_events_url":"https://api.github.com/users/pamelafox/received_events","type":"User","site_admin":false},"body":"Hm no. I re-gulped after the merge. I'll try gulp again.\r\n\r\nOn Sun, Nov 9, 2014 at 1:36 PM, Jamie Wong <notifications@github.com> wrote:\r\n\r\n> In build/css/live-editor.ui.css:\r\n>\r\n> > @@ -1,3 +1,5 @@\r\n> > +<<<<<<< HEAD\r\n>\r\n> I don't think you meant to check this in...\r\n>\r\n> —\r\n> Reply to this email directly or view it on GitHub\r\n> <https://github.com/Khan/live-editor/pull/194/files#r20061640>.\r\n>","created_at":"2014-11-09T21:37:46Z","updated_at":"2014-11-09T21:37:46Z","html_url":"https://github.com/Khan/live-editor/pull/194#discussion_r20061659","pull_request_url":"https://api.github.com/repos/Khan/live-editor/pulls/194","_links":{"self":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/comments/20061659"},"html":{"href":"https://github.com/Khan/live-editor/pull/194#discussion_r20061659"},"pull_request":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/194"}}},"pull_request":{"url":"https://api.github.com/repos/Khan/live-editor/pulls/194","id":23918634,"html_url":"https://github.com/Khan/live-editor/pull/194","diff_url":"https://github.com/Khan/live-editor/pull/194.diff","patch_url":"https://github.com/Khan/live-editor/pull/194.patch","issue_url":"https://api.github.com/repos/Khan/live-editor/issues/194","number":194,"state":"closed","locked":false,"title":"Tweak image resizing script and add new images","user":{"login":"pamelafox","id":297042,"avatar_url":"https://avatars.githubusercontent.com/u/297042?v=3","gravatar_id":"","url":"https://api.github.com/users/pamelafox","html_url":"https://github.com/pamelafox","followers_url":"https://api.github.com/users/pamelafox/followers","following_url":"https://api.github.com/users/pamelafox/following{/other_user}","gists_url":"https://api.github.com/users/pamelafox/gists{/gist_id}","starred_url":"https://api.github.com/users/pamelafox/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pamelafox/subscriptions","organizations_url":"https://api.github.com/users/pamelafox/orgs","repos_url":"https://api.github.com/users/pamelafox/repos","events_url":"https://api.github.com/users/pamelafox/events{/privacy}","received_events_url":"https://api.github.com/users/pamelafox/received_events","type":"User","site_admin":false},"body":"I changed the script so that when I call it with no arguments,\r\nit just Does The Right Thing (makes original and thumbs).\r\nI also added more images, inc. 2 new categories, landscapes and food.\r\nI could actually remove /images from the build folder now,\r\nas I'm uploading them to S3 now.\r\nLet me know if you think I should do that now.\r\n\r\nTest Plan:\r\n- Go to /cs/new/webpage\r\n- Insert an <img>, see new food and landscapes categories show up\r\n","created_at":"2014-11-05T16:36:48Z","updated_at":"2014-11-09T21:37:46Z","closed_at":"2014-11-09T20:56:43Z","merged_at":"2014-11-09T20:56:43Z","merge_commit_sha":"9e45e06ac51b064a2ec1d5da06eaf30254f22504","assignee":{"login":"lemiant","id":6732951,"avatar_url":"https://avatars.githubusercontent.com/u/6732951?v=3","gravatar_id":"","url":"https://api.github.com/users/lemiant","html_url":"https://github.com/lemiant","followers_url":"https://api.github.com/users/lemiant/followers","following_url":"https://api.github.com/users/lemiant/following{/other_user}","gists_url":"https://api.github.com/users/lemiant/gists{/gist_id}","starred_url":"https://api.github.com/users/lemiant/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lemiant/subscriptions","organizations_url":"https://api.github.com/users/lemiant/orgs","repos_url":"https://api.github.com/users/lemiant/repos","events_url":"https://api.github.com/users/lemiant/events{/privacy}","received_events_url":"https://api.github.com/users/lemiant/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/Khan/live-editor/pulls/194/commits","review_comments_url":"https://api.github.com/repos/Khan/live-editor/pulls/194/comments","review_comment_url":"https://api.github.com/repos/Khan/live-editor/pulls/comments/{number}","comments_url":"https://api.github.com/repos/Khan/live-editor/issues/194/comments","statuses_url":"https://api.github.com/repos/Khan/live-editor/statuses/7469a2fe7785edd920f4862e2e40fc3244605141","head":{"label":"Khan:pf-new-images","ref":"pf-new-images","sha":"7469a2fe7785edd920f4862e2e40fc3244605141","user":{"login":"Khan","id":15455,"avatar_url":"https://avatars.githubusercontent.com/u/15455?v=3","gravatar_id":"","url":"https://api.github.com/users/Khan","html_url":"https://github.com/Khan","followers_url":"https://api.github.com/users/Khan/followers","following_url":"https://api.github.com/users/Khan/following{/other_user}","gists_url":"https://api.github.com/users/Khan/gists{/gist_id}","starred_url":"https://api.github.com/users/Khan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Khan/subscriptions","organizations_url":"https://api.github.com/users/Khan/orgs","repos_url":"https://api.github.com/users/Khan/repos","events_url":"https://api.github.com/users/Khan/events{/privacy}","received_events_url":"https://api.github.com/users/Khan/received_events","type":"Organization","site_admin":false},"repo":{"id":2675949,"name":"live-editor","full_name":"Khan/live-editor","owner":{"login":"Khan","id":15455,"avatar_url":"https://avatars.githubusercontent.com/u/15455?v=3","gravatar_id":"","url":"https://api.github.com/users/Khan","html_url":"https://github.com/Khan","followers_url":"https://api.github.com/users/Khan/followers","following_url":"https://api.github.com/users/Khan/following{/other_user}","gists_url":"https://api.github.com/users/Khan/gists{/gist_id}","starred_url":"https://api.github.com/users/Khan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Khan/subscriptions","organizations_url":"https://api.github.com/users/Khan/orgs","repos_url":"https://api.github.com/users/Khan/repos","events_url":"https://api.github.com/users/Khan/events{/privacy}","received_events_url":"https://api.github.com/users/Khan/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Khan/live-editor","description":"A browser-based live coding environment.","fork":false,"url":"https://api.github.com/repos/Khan/live-editor","forks_url":"https://api.github.com/repos/Khan/live-editor/forks","keys_url":"https://api.github.com/repos/Khan/live-editor/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Khan/live-editor/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Khan/live-editor/teams","hooks_url":"https://api.github.com/repos/Khan/live-editor/hooks","issue_events_url":"https://api.github.com/repos/Khan/live-editor/issues/events{/number}","events_url":"https://api.github.com/repos/Khan/live-editor/events","assignees_url":"https://api.github.com/repos/Khan/live-editor/assignees{/user}","branches_url":"https://api.github.com/repos/Khan/live-editor/branches{/branch}","tags_url":"https://api.github.com/repos/Khan/live-editor/tags","blobs_url":"https://api.github.com/repos/Khan/live-editor/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Khan/live-editor/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Khan/live-editor/git/refs{/sha}","trees_url":"https://api.github.com/repos/Khan/live-editor/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Khan/live-editor/statuses/{sha}","languages_url":"https://api.github.com/repos/Khan/live-editor/languages","stargazers_url":"https://api.github.com/repos/Khan/live-editor/stargazers","contributors_url":"https://api.github.com/repos/Khan/live-editor/contributors","subscribers_url":"https://api.github.com/repos/Khan/live-editor/subscribers","subscription_url":"https://api.github.com/repos/Khan/live-editor/subscription","commits_url":"https://api.github.com/repos/Khan/live-editor/commits{/sha}","git_commits_url":"https://api.github.com/repos/Khan/live-editor/git/commits{/sha}","comments_url":"https://api.github.com/repos/Khan/live-editor/comments{/number}","issue_comment_url":"https://api.github.com/repos/Khan/live-editor/issues/comments/{number}","contents_url":"https://api.github.com/repos/Khan/live-editor/contents/{+path}","compare_url":"https://api.github.com/repos/Khan/live-editor/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Khan/live-editor/merges","archive_url":"https://api.github.com/repos/Khan/live-editor/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Khan/live-editor/downloads","issues_url":"https://api.github.com/repos/Khan/live-editor/issues{/number}","pulls_url":"https://api.github.com/repos/Khan/live-editor/pulls{/number}","milestones_url":"https://api.github.com/repos/Khan/live-editor/milestones{/number}","notifications_url":"https://api.github.com/repos/Khan/live-editor/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Khan/live-editor/labels{/name}","releases_url":"https://api.github.com/repos/Khan/live-editor/releases{/id}","created_at":"2011-10-30T16:39:46Z","updated_at":"2014-11-06T22:41:35Z","pushed_at":"2014-11-09T20:56:43Z","git_url":"git://github.com/Khan/live-editor.git","ssh_url":"git@github.com:Khan/live-editor.git","clone_url":"https://github.com/Khan/live-editor.git","svn_url":"https://github.com/Khan/live-editor","homepage":"","size":65216,"stargazers_count":142,"watchers_count":142,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":20,"mirror_url":null,"open_issues_count":15,"forks":20,"open_issues":15,"watchers":142,"default_branch":"master"}},"base":{"label":"Khan:master","ref":"master","sha":"68526c015d51929b6f07573cb7713295ee0cbd1f","user":{"login":"Khan","id":15455,"avatar_url":"https://avatars.githubusercontent.com/u/15455?v=3","gravatar_id":"","url":"https://api.github.com/users/Khan","html_url":"https://github.com/Khan","followers_url":"https://api.github.com/users/Khan/followers","following_url":"https://api.github.com/users/Khan/following{/other_user}","gists_url":"https://api.github.com/users/Khan/gists{/gist_id}","starred_url":"https://api.github.com/users/Khan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Khan/subscriptions","organizations_url":"https://api.github.com/users/Khan/orgs","repos_url":"https://api.github.com/users/Khan/repos","events_url":"https://api.github.com/users/Khan/events{/privacy}","received_events_url":"https://api.github.com/users/Khan/received_events","type":"Organization","site_admin":false},"repo":{"id":2675949,"name":"live-editor","full_name":"Khan/live-editor","owner":{"login":"Khan","id":15455,"avatar_url":"https://avatars.githubusercontent.com/u/15455?v=3","gravatar_id":"","url":"https://api.github.com/users/Khan","html_url":"https://github.com/Khan","followers_url":"https://api.github.com/users/Khan/followers","following_url":"https://api.github.com/users/Khan/following{/other_user}","gists_url":"https://api.github.com/users/Khan/gists{/gist_id}","starred_url":"https://api.github.com/users/Khan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Khan/subscriptions","organizations_url":"https://api.github.com/users/Khan/orgs","repos_url":"https://api.github.com/users/Khan/repos","events_url":"https://api.github.com/users/Khan/events{/privacy}","received_events_url":"https://api.github.com/users/Khan/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Khan/live-editor","description":"A browser-based live coding environment.","fork":false,"url":"https://api.github.com/repos/Khan/live-editor","forks_url":"https://api.github.com/repos/Khan/live-editor/forks","keys_url":"https://api.github.com/repos/Khan/live-editor/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Khan/live-editor/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Khan/live-editor/teams","hooks_url":"https://api.github.com/repos/Khan/live-editor/hooks","issue_events_url":"https://api.github.com/repos/Khan/live-editor/issues/events{/number}","events_url":"https://api.github.com/repos/Khan/live-editor/events","assignees_url":"https://api.github.com/repos/Khan/live-editor/assignees{/user}","branches_url":"https://api.github.com/repos/Khan/live-editor/branches{/branch}","tags_url":"https://api.github.com/repos/Khan/live-editor/tags","blobs_url":"https://api.github.com/repos/Khan/live-editor/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Khan/live-editor/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Khan/live-editor/git/refs{/sha}","trees_url":"https://api.github.com/repos/Khan/live-editor/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Khan/live-editor/statuses/{sha}","languages_url":"https://api.github.com/repos/Khan/live-editor/languages","stargazers_url":"https://api.github.com/repos/Khan/live-editor/stargazers","contributors_url":"https://api.github.com/repos/Khan/live-editor/contributors","subscribers_url":"https://api.github.com/repos/Khan/live-editor/subscribers","subscription_url":"https://api.github.com/repos/Khan/live-editor/subscription","commits_url":"https://api.github.com/repos/Khan/live-editor/commits{/sha}","git_commits_url":"https://api.github.com/repos/Khan/live-editor/git/commits{/sha}","comments_url":"https://api.github.com/repos/Khan/live-editor/comments{/number}","issue_comment_url":"https://api.github.com/repos/Khan/live-editor/issues/comments/{number}","contents_url":"https://api.github.com/repos/Khan/live-editor/contents/{+path}","compare_url":"https://api.github.com/repos/Khan/live-editor/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Khan/live-editor/merges","archive_url":"https://api.github.com/repos/Khan/live-editor/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Khan/live-editor/downloads","issues_url":"https://api.github.com/repos/Khan/live-editor/issues{/number}","pulls_url":"https://api.github.com/repos/Khan/live-editor/pulls{/number}","milestones_url":"https://api.github.com/repos/Khan/live-editor/milestones{/number}","notifications_url":"https://api.github.com/repos/Khan/live-editor/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Khan/live-editor/labels{/name}","releases_url":"https://api.github.com/repos/Khan/live-editor/releases{/id}","created_at":"2011-10-30T16:39:46Z","updated_at":"2014-11-06T22:41:35Z","pushed_at":"2014-11-09T20:56:43Z","git_url":"git://github.com/Khan/live-editor.git","ssh_url":"git@github.com:Khan/live-editor.git","clone_url":"https://github.com/Khan/live-editor.git","svn_url":"https://github.com/Khan/live-editor","homepage":"","size":65216,"stargazers_count":142,"watchers_count":142,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":20,"mirror_url":null,"open_issues_count":15,"forks":20,"open_issues":15,"watchers":142,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/194"},"html":{"href":"https://github.com/Khan/live-editor/pull/194"},"issue":{"href":"https://api.github.com/repos/Khan/live-editor/issues/194"},"comments":{"href":"https://api.github.com/repos/Khan/live-editor/issues/194/comments"},"review_comments":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/194/comments"},"review_comment":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/Khan/live-editor/pulls/194/commits"},"statuses":{"href":"https://api.github.com/repos/Khan/live-editor/statuses/7469a2fe7785edd920f4862e2e40fc3244605141"}}}}