Revert "Add support for reopened GitLab MR (#935)"

This reverts commit e5705e7.
matrix-org · Jun 20, 2024 · 3a8f489 · 3a8f489
1 parent 5dae23b
commit 3a8f489
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 27 deletions.
diff --git a/docs/usage/room_configuration/gitlab_project.md b/docs/usage/room_configuration/gitlab_project.md
@@ -46,7 +46,6 @@ the events marked as default below will be enabled. Otherwise, this is ignored.
   - merge_request.close *
   - merge_request.merge *
   - merge_request.open *
-  - merge_request.reopen *
   - merge_request.review.comments *
   - merge_request.review *
   - merge_request.review.individual

diff --git a/src/Bridge.ts b/src/Bridge.ts
@@ -344,12 +344,6 @@ export class Bridge {
             (c, data) => c.onMergeRequestOpened(data),
         );
 
-        this.bindHandlerToQueue<IGitLabWebhookMREvent, GitLabRepoConnection>(
-            "gitlab.merge_request.reopen",
-            (data) => connManager.getConnectionsForGitLabRepo(data.project.path_with_namespace),
-            (c, data) => c.onMergeRequestReopened(data),
-        );
-
         this.bindHandlerToQueue<IGitLabWebhookMREvent, GitLabRepoConnection>(
             "gitlab.merge_request.close",
             (data) => connManager.getConnectionsForGitLabRepo(data.project.path_with_namespace),

diff --git a/src/Connections/GitlabRepo.ts b/src/Connections/GitlabRepo.ts
@@ -63,7 +63,6 @@ export type GitLabRepoResponseItem = GetConnectionsResponseItem<GitLabRepoConnec
 
 type AllowedEventsNames =
     "merge_request.open" |
-    "merge_request.reopen" |
     "merge_request.close" |
     "merge_request.merge" |
     "merge_request.review" |
@@ -81,7 +80,6 @@ type AllowedEventsNames =
 
 const AllowedEvents: AllowedEventsNames[] = [
     "merge_request.open",
-    "merge_request.reopen",
     "merge_request.close",
     "merge_request.merge",
     "merge_request.review",
@@ -567,22 +565,6 @@ export class GitLabRepoConnection extends CommandConnection<GitLabRepoConnection
         });
     }
 
-    public async onMergeRequestReopened(event: IGitLabWebhookMREvent) {
-        if (this.hookFilter.shouldSkip('merge_request', 'merge_request.reopen') || !this.matchesLabelFilter(event)) {
-            return;
-        }
-        log.info(`onMergeRequestReopened ${this.roomId} ${this.path} !${event.object_attributes.iid}`);
-        this.validateMREvent(event);
-        const orgRepoName = event.project.path_with_namespace;
-        const content = `**${event.user.username}** reopened MR [${orgRepoName}!${event.object_attributes.iid}](${event.object_attributes.url}): "${event.object_attributes.title}"`;
-        await this.intent.sendEvent(this.roomId, {
-            msgtype: "m.notice",
-            body: content,
-            formatted_body: md.renderInline(content),
-            format: "org.matrix.custom.html",
-        });
-    }
-
     public async onMergeRequestClosed(event: IGitLabWebhookMREvent) {
         if (this.hookFilter.shouldSkip('merge_request', 'merge_request.close') || !this.matchesLabelFilter(event)) {
             return;

diff --git a/tests/connections/GitlabRepoTest.ts b/tests/connections/GitlabRepoTest.ts
@@ -97,7 +97,6 @@ describe("GitLabRepoConnection", () => {
 				path: "bar/baz",
 				enableHooks: [
 					"merge_request.open",
-					"merge_request.reopen",
 					"merge_request.close",
 					"merge_request.merge",
 					"merge_request.review",

diff --git a/web/components/roomConfig/GitlabRepoConfig.tsx b/web/components/roomConfig/GitlabRepoConfig.tsx
@@ -97,7 +97,6 @@ const ConnectionConfiguration: FunctionComponent<ConnectionConfigurationProps<ne
                 <EventHookCheckbox enabledHooks={enabledHooks} hookEventName="merge_request" onChange={toggleEnabledHook}>Merge requests</EventHookCheckbox>
                 <ul>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.open" onChange={toggleEnabledHook}>Opened</EventHookCheckbox>
-                    <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.reopen" onChange={toggleEnabledHook}>Reopened</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.close" onChange={toggleEnabledHook}>Closed</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.merge" onChange={toggleEnabledHook}>Merged</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.review" onChange={toggleEnabledHook}>Completed review</EventHookCheckbox>