{"action":"created","issue":{"url":"https://api.github.com/repos/go-gitea/gitea/issues/4052","repository_url":"https://api.github.com/repos/go-gitea/gitea","labels_url":"https://api.github.com/repos/go-gitea/gitea/issues/4052/labels{/name}","comments_url":"https://api.github.com/repos/go-gitea/gitea/issues/4052/comments","events_url":"https://api.github.com/repos/go-gitea/gitea/issues/4052/events","html_url":"https://github.com/go-gitea/gitea/pull/4052","id":326753275,"node_id":"MDExOlB1bGxSZXF1ZXN0MTkwNzUwOTIw","number":4052,"title":"Add rebase with merge commit merge style (#3844)","user":{"login":"apricote","id":3393079,"node_id":"MDQ6VXNlcjMzOTMwNzk=","avatar_url":"https://avatars0.githubusercontent.com/u/3393079?v=4","gravatar_id":"","url":"https://api.github.com/users/apricote","html_url":"https://github.com/apricote","followers_url":"https://api.github.com/users/apricote/followers","following_url":"https://api.github.com/users/apricote/following{/other_user}","gists_url":"https://api.github.com/users/apricote/gists{/gist_id}","starred_url":"https://api.github.com/users/apricote/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apricote/subscriptions","organizations_url":"https://api.github.com/users/apricote/orgs","repos_url":"https://api.github.com/users/apricote/repos","events_url":"https://api.github.com/users/apricote/events{/privacy}","received_events_url":"https://api.github.com/users/apricote/received_events","type":"User","site_admin":false},"labels":[{"id":474798837,"node_id":"MDU6TGFiZWw0NzQ3OTg4Mzc=","url":"https://api.github.com/repos/go-gitea/gitea/labels/kind/feature","name":"kind/feature","color":"006b75","default":false},{"id":475283583,"node_id":"MDU6TGFiZWw0NzUyODM1ODM=","url":"https://api.github.com/repos/go-gitea/gitea/labels/lgtm/need%202","name":"lgtm/need 2","color":"d93f0b","default":false}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/go-gitea/gitea/milestones/24","html_url":"https://github.com/go-gitea/gitea/milestone/24","labels_url":"https://api.github.com/repos/go-gitea/gitea/milestones/24/labels","id":3338092,"node_id":"MDk6TWlsZXN0b25lMzMzODA5Mg==","number":24,"title":"1.6.0","description":"","creator":{"login":"lunny","id":81045,"node_id":"MDQ6VXNlcjgxMDQ1","avatar_url":"https://avatars2.githubusercontent.com/u/81045?v=4","gravatar_id":"","url":"https://api.github.com/users/lunny","html_url":"https://github.com/lunny","followers_url":"https://api.github.com/users/lunny/followers","following_url":"https://api.github.com/users/lunny/following{/other_user}","gists_url":"https://api.github.com/users/lunny/gists{/gist_id}","starred_url":"https://api.github.com/users/lunny/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lunny/subscriptions","organizations_url":"https://api.github.com/users/lunny/orgs","repos_url":"https://api.github.com/users/lunny/repos","events_url":"https://api.github.com/users/lunny/events{/privacy}","received_events_url":"https://api.github.com/users/lunny/received_events","type":"User","site_admin":false},"open_issues":59,"closed_issues":41,"state":"open","created_at":"2018-05-11T05:37:01Z","updated_at":"2018-07-19T15:39:20Z","due_on":"2018-09-01T07:00:00Z","closed_at":null},"comments":5,"created_at":"2018-05-26T17:11:26Z","updated_at":"2018-07-19T17:42:34Z","closed_at":null,"author_association":"NONE","pull_request":{"url":"https://api.github.com/repos/go-gitea/gitea/pulls/4052","html_url":"https://github.com/go-gitea/gitea/pull/4052","diff_url":"https://github.com/go-gitea/gitea/pull/4052.diff","patch_url":"https://github.com/go-gitea/gitea/pull/4052.patch"},"body":"This PR adds the `Rebase and Merge (--no-ff)` merge style as requested in #3844.\r\n\r\n---\r\n\r\nKnown Bugs:\r\n- [x] ~~As with the `Rebase and Merge` style, if the rebase can not be done cleanly, the merge will result in a `500` error page~~ Tracked in #4078 "},"comment":{"url":"https://api.github.com/repos/go-gitea/gitea/issues/comments/406358335","html_url":"https://github.com/go-gitea/gitea/pull/4052#issuecomment-406358335","issue_url":"https://api.github.com/repos/go-gitea/gitea/issues/4052","id":406358335,"node_id":"MDEyOklzc3VlQ29tbWVudDQwNjM1ODMzNQ==","user":{"login":"techknowlogick","id":164197,"node_id":"MDQ6VXNlcjE2NDE5Nw==","avatar_url":"https://avatars1.githubusercontent.com/u/164197?v=4","gravatar_id":"","url":"https://api.github.com/users/techknowlogick","html_url":"https://github.com/techknowlogick","followers_url":"https://api.github.com/users/techknowlogick/followers","following_url":"https://api.github.com/users/techknowlogick/following{/other_user}","gists_url":"https://api.github.com/users/techknowlogick/gists{/gist_id}","starred_url":"https://api.github.com/users/techknowlogick/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/techknowlogick/subscriptions","organizations_url":"https://api.github.com/users/techknowlogick/orgs","repos_url":"https://api.github.com/users/techknowlogick/repos","events_url":"https://api.github.com/users/techknowlogick/events{/privacy}","received_events_url":"https://api.github.com/users/techknowlogick/received_events","type":"User","site_admin":false},"created_at":"2018-07-19T17:42:34Z","updated_at":"2018-07-19T17:42:34Z","author_association":"MEMBER","body":"@apricote you may find a maintainer that will resolve conflicts for you, however my personal approach is to only touch someones PR when they've asked for help resolving a conflict. My preference to start reviews is that all conflicts are resolved (so that I can trigger drone to build against the most recent commit in master).\r\n\r\nLike you said, the best way to get someones attention is to bring it up in the `#develop` channel in discord."}}
{"actor":{"display_login":"techknowlogick"}}