{"action":"closed","number":614,"pull_request":{"url":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614","id":204791723,"node_id":"MDExOlB1bGxSZXF1ZXN0MjA0NzkxNzIz","html_url":"https://github.com/glitch-soc/mastodon/pull/614","diff_url":"https://github.com/glitch-soc/mastodon/pull/614.diff","patch_url":"https://github.com/glitch-soc/mastodon/pull/614.patch","issue_url":"https://api.github.com/repos/glitch-soc/mastodon/issues/614","number":614,"state":"closed","locked":false,"title":"Merge upstream changes up to (excluding) profile redesign","user":{"login":"ThibG","id":384364,"node_id":"MDQ6VXNlcjM4NDM2NA==","avatar_url":"https://avatars2.githubusercontent.com/u/384364?v=4","gravatar_id":"","url":"https://api.github.com/users/ThibG","html_url":"https://github.com/ThibG","followers_url":"https://api.github.com/users/ThibG/followers","following_url":"https://api.github.com/users/ThibG/following{/other_user}","gists_url":"https://api.github.com/users/ThibG/gists{/gist_id}","starred_url":"https://api.github.com/users/ThibG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThibG/subscriptions","organizations_url":"https://api.github.com/users/ThibG/orgs","repos_url":"https://api.github.com/users/ThibG/repos","events_url":"https://api.github.com/users/ThibG/events{/privacy}","received_events_url":"https://api.github.com/users/ThibG/received_events","type":"User","site_admin":false},"body":"I'm not too sure about the public profile redesign yet, and it will probably be a bit of work to get it working properly with glitch-soc, so I'm postponing for now.\r\n\r\nThere is still value in the image resizing commit, which would be good to get in as soon as possible as it will allow more image geometries from other instances.\r\n\r\nNo conflicts.","created_at":"2018-07-30T12:43:13Z","updated_at":"2018-07-30T14:51:56Z","closed_at":"2018-07-30T14:51:56Z","merged_at":"2018-07-30T14:51:56Z","merge_commit_sha":"ce090a5201aceaab9a5c9621a6cdb3c7beefcc40","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614/commits","review_comments_url":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614/comments","review_comment_url":"https://api.github.com/repos/glitch-soc/mastodon/pulls/comments{/number}","comments_url":"https://api.github.com/repos/glitch-soc/mastodon/issues/614/comments","statuses_url":"https://api.github.com/repos/glitch-soc/mastodon/statuses/5f1bdca4c8c3f34e0cc8f6ed3b6a264f42cc8ed2","head":{"label":"ThibG:glitch-soc/merge-upstream","ref":"glitch-soc/merge-upstream","sha":"5f1bdca4c8c3f34e0cc8f6ed3b6a264f42cc8ed2","user":{"login":"ThibG","id":384364,"node_id":"MDQ6VXNlcjM4NDM2NA==","avatar_url":"https://avatars2.githubusercontent.com/u/384364?v=4","gravatar_id":"","url":"https://api.github.com/users/ThibG","html_url":"https://github.com/ThibG","followers_url":"https://api.github.com/users/ThibG/followers","following_url":"https://api.github.com/users/ThibG/following{/other_user}","gists_url":"https://api.github.com/users/ThibG/gists{/gist_id}","starred_url":"https://api.github.com/users/ThibG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThibG/subscriptions","organizations_url":"https://api.github.com/users/ThibG/orgs","repos_url":"https://api.github.com/users/ThibG/repos","events_url":"https://api.github.com/users/ThibG/events{/privacy}","received_events_url":"https://api.github.com/users/ThibG/received_events","type":"User","site_admin":false},"repo":{"id":87636240,"node_id":"MDEwOlJlcG9zaXRvcnk4NzYzNjI0MA==","name":"mastodon","full_name":"ThibG/mastodon","owner":{"login":"ThibG","id":384364,"node_id":"MDQ6VXNlcjM4NDM2NA==","avatar_url":"https://avatars2.githubusercontent.com/u/384364?v=4","gravatar_id":"","url":"https://api.github.com/users/ThibG","html_url":"https://github.com/ThibG","followers_url":"https://api.github.com/users/ThibG/followers","following_url":"https://api.github.com/users/ThibG/following{/other_user}","gists_url":"https://api.github.com/users/ThibG/gists{/gist_id}","starred_url":"https://api.github.com/users/ThibG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThibG/subscriptions","organizations_url":"https://api.github.com/users/ThibG/orgs","repos_url":"https://api.github.com/users/ThibG/repos","events_url":"https://api.github.com/users/ThibG/events{/privacy}","received_events_url":"https://api.github.com/users/ThibG/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ThibG/mastodon","description":"A GNU Social-compatible microblogging server","fork":true,"url":"https://api.github.com/repos/ThibG/mastodon","forks_url":"https://api.github.com/repos/ThibG/mastodon/forks","keys_url":"https://api.github.com/repos/ThibG/mastodon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ThibG/mastodon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ThibG/mastodon/teams","hooks_url":"https://api.github.com/repos/ThibG/mastodon/hooks","issue_events_url":"https://api.github.com/repos/ThibG/mastodon/issues/events{/number}","events_url":"https://api.github.com/repos/ThibG/mastodon/events","assignees_url":"https://api.github.com/repos/ThibG/mastodon/assignees{/user}","branches_url":"https://api.github.com/repos/ThibG/mastodon/branches{/branch}","tags_url":"https://api.github.com/repos/ThibG/mastodon/tags","blobs_url":"https://api.github.com/repos/ThibG/mastodon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ThibG/mastodon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ThibG/mastodon/git/refs{/sha}","trees_url":"https://api.github.com/repos/ThibG/mastodon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ThibG/mastodon/statuses/{sha}","languages_url":"https://api.github.com/repos/ThibG/mastodon/languages","stargazers_url":"https://api.github.com/repos/ThibG/mastodon/stargazers","contributors_url":"https://api.github.com/repos/ThibG/mastodon/contributors","subscribers_url":"https://api.github.com/repos/ThibG/mastodon/subscribers","subscription_url":"https://api.github.com/repos/ThibG/mastodon/subscription","commits_url":"https://api.github.com/repos/ThibG/mastodon/commits{/sha}","git_commits_url":"https://api.github.com/repos/ThibG/mastodon/git/commits{/sha}","comments_url":"https://api.github.com/repos/ThibG/mastodon/comments{/number}","issue_comment_url":"https://api.github.com/repos/ThibG/mastodon/issues/comments{/number}","contents_url":"https://api.github.com/repos/ThibG/mastodon/contents/{+path}","compare_url":"https://api.github.com/repos/ThibG/mastodon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ThibG/mastodon/merges","archive_url":"https://api.github.com/repos/ThibG/mastodon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ThibG/mastodon/downloads","issues_url":"https://api.github.com/repos/ThibG/mastodon/issues{/number}","pulls_url":"https://api.github.com/repos/ThibG/mastodon/pulls{/number}","milestones_url":"https://api.github.com/repos/ThibG/mastodon/milestones{/number}","notifications_url":"https://api.github.com/repos/ThibG/mastodon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ThibG/mastodon/labels{/name}","releases_url":"https://api.github.com/repos/ThibG/mastodon/releases{/id}","deployments_url":"https://api.github.com/repos/ThibG/mastodon/deployments","created_at":"2017-04-08T13:36:20Z","updated_at":"2018-07-28T12:19:47Z","pushed_at":"2018-07-30T12:40:51Z","git_url":"git://github.com/ThibG/mastodon.git","ssh_url":"git@github.com:ThibG/mastodon.git","clone_url":"https://github.com/ThibG/mastodon.git","svn_url":"https://github.com/ThibG/mastodon","homepage":"https://mastodon.social","size":68988,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"glitch-soc:master","ref":"master","sha":"b02bfe86ce26ef001420841673257c9c5326b45c","user":{"login":"glitch-soc","id":27831455,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI3ODMxNDU1","avatar_url":"https://avatars3.githubusercontent.com/u/27831455?v=4","gravatar_id":"","url":"https://api.github.com/users/glitch-soc","html_url":"https://github.com/glitch-soc","followers_url":"https://api.github.com/users/glitch-soc/followers","following_url":"https://api.github.com/users/glitch-soc/following{/other_user}","gists_url":"https://api.github.com/users/glitch-soc/gists{/gist_id}","starred_url":"https://api.github.com/users/glitch-soc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glitch-soc/subscriptions","organizations_url":"https://api.github.com/users/glitch-soc/orgs","repos_url":"https://api.github.com/users/glitch-soc/repos","events_url":"https://api.github.com/users/glitch-soc/events{/privacy}","received_events_url":"https://api.github.com/users/glitch-soc/received_events","type":"Organization","site_admin":false},"repo":{"id":88913859,"node_id":"MDEwOlJlcG9zaXRvcnk4ODkxMzg1OQ==","name":"mastodon","full_name":"glitch-soc/mastodon","owner":{"login":"glitch-soc","id":27831455,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI3ODMxNDU1","avatar_url":"https://avatars3.githubusercontent.com/u/27831455?v=4","gravatar_id":"","url":"https://api.github.com/users/glitch-soc","html_url":"https://github.com/glitch-soc","followers_url":"https://api.github.com/users/glitch-soc/followers","following_url":"https://api.github.com/users/glitch-soc/following{/other_user}","gists_url":"https://api.github.com/users/glitch-soc/gists{/gist_id}","starred_url":"https://api.github.com/users/glitch-soc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glitch-soc/subscriptions","organizations_url":"https://api.github.com/users/glitch-soc/orgs","repos_url":"https://api.github.com/users/glitch-soc/repos","events_url":"https://api.github.com/users/glitch-soc/events{/privacy}","received_events_url":"https://api.github.com/users/glitch-soc/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/glitch-soc/mastodon","description":"A glitchy but lovable microblogging server","fork":true,"url":"https://api.github.com/repos/glitch-soc/mastodon","forks_url":"https://api.github.com/repos/glitch-soc/mastodon/forks","keys_url":"https://api.github.com/repos/glitch-soc/mastodon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/glitch-soc/mastodon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/glitch-soc/mastodon/teams","hooks_url":"https://api.github.com/repos/glitch-soc/mastodon/hooks","issue_events_url":"https://api.github.com/repos/glitch-soc/mastodon/issues/events{/number}","events_url":"https://api.github.com/repos/glitch-soc/mastodon/events","assignees_url":"https://api.github.com/repos/glitch-soc/mastodon/assignees{/user}","branches_url":"https://api.github.com/repos/glitch-soc/mastodon/branches{/branch}","tags_url":"https://api.github.com/repos/glitch-soc/mastodon/tags","blobs_url":"https://api.github.com/repos/glitch-soc/mastodon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/glitch-soc/mastodon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/glitch-soc/mastodon/git/refs{/sha}","trees_url":"https://api.github.com/repos/glitch-soc/mastodon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/glitch-soc/mastodon/statuses/{sha}","languages_url":"https://api.github.com/repos/glitch-soc/mastodon/languages","stargazers_url":"https://api.github.com/repos/glitch-soc/mastodon/stargazers","contributors_url":"https://api.github.com/repos/glitch-soc/mastodon/contributors","subscribers_url":"https://api.github.com/repos/glitch-soc/mastodon/subscribers","subscription_url":"https://api.github.com/repos/glitch-soc/mastodon/subscription","commits_url":"https://api.github.com/repos/glitch-soc/mastodon/commits{/sha}","git_commits_url":"https://api.github.com/repos/glitch-soc/mastodon/git/commits{/sha}","comments_url":"https://api.github.com/repos/glitch-soc/mastodon/comments{/number}","issue_comment_url":"https://api.github.com/repos/glitch-soc/mastodon/issues/comments{/number}","contents_url":"https://api.github.com/repos/glitch-soc/mastodon/contents/{+path}","compare_url":"https://api.github.com/repos/glitch-soc/mastodon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/glitch-soc/mastodon/merges","archive_url":"https://api.github.com/repos/glitch-soc/mastodon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/glitch-soc/mastodon/downloads","issues_url":"https://api.github.com/repos/glitch-soc/mastodon/issues{/number}","pulls_url":"https://api.github.com/repos/glitch-soc/mastodon/pulls{/number}","milestones_url":"https://api.github.com/repos/glitch-soc/mastodon/milestones{/number}","notifications_url":"https://api.github.com/repos/glitch-soc/mastodon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/glitch-soc/mastodon/labels{/name}","releases_url":"https://api.github.com/repos/glitch-soc/mastodon/releases{/id}","deployments_url":"https://api.github.com/repos/glitch-soc/mastodon/deployments","created_at":"2017-04-20T21:55:28Z","updated_at":"2018-07-30T12:32:06Z","pushed_at":"2018-07-30T14:51:56Z","git_url":"git://github.com/glitch-soc/mastodon.git","ssh_url":"git@github.com:glitch-soc/mastodon.git","clone_url":"https://github.com/glitch-soc/mastodon.git","svn_url":"https://github.com/glitch-soc/mastodon","homepage":"https://dev.glitch.social","size":68907,"stargazers_count":63,"watchers_count":63,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":17,"mirror_url":null,"archived":false,"open_issues_count":118,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":17,"open_issues":118,"watchers":63,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614"},"html":{"href":"https://github.com/glitch-soc/mastodon/pull/614"},"issue":{"href":"https://api.github.com/repos/glitch-soc/mastodon/issues/614"},"comments":{"href":"https://api.github.com/repos/glitch-soc/mastodon/issues/614/comments"},"review_comments":{"href":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614/comments"},"review_comment":{"href":"https://api.github.com/repos/glitch-soc/mastodon/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/glitch-soc/mastodon/pulls/614/commits"},"statuses":{"href":"https://api.github.com/repos/glitch-soc/mastodon/statuses/5f1bdca4c8c3f34e0cc8f6ed3b6a264f42cc8ed2"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"ThibG","id":384364,"node_id":"MDQ6VXNlcjM4NDM2NA==","avatar_url":"https://avatars2.githubusercontent.com/u/384364?v=4","gravatar_id":"","url":"https://api.github.com/users/ThibG","html_url":"https://github.com/ThibG","followers_url":"https://api.github.com/users/ThibG/followers","following_url":"https://api.github.com/users/ThibG/following{/other_user}","gists_url":"https://api.github.com/users/ThibG/gists{/gist_id}","starred_url":"https://api.github.com/users/ThibG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThibG/subscriptions","organizations_url":"https://api.github.com/users/ThibG/orgs","repos_url":"https://api.github.com/users/ThibG/repos","events_url":"https://api.github.com/users/ThibG/events{/privacy}","received_events_url":"https://api.github.com/users/ThibG/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":3,"additions":22,"deletions":24,"changed_files":6}}
{"actor":{"display_login":"ThibG"}}