Skip to content
Snippets Groups Projects

Fix MR notifications for slack and hipchat when approvals are fullfiled

Merged Gabriel Mazetto requested to merge patch/fix-merge-request-notifications into master

A Slack notification comes in after opening a MR about the MR being opened but it also comes in after a MR gets the minimum number of approvers and it uses the same message.

Same behavior is present in hipchat notifications.

Fixes #462 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @brodock Nice! I had a few style remarks, also, please add a CHANGELOG entry.

  • Gabriel Mazetto Added 1527 commits:

    Added 1527 commits:

    • 2827d278...f619d34f - 1399 commits from branch master
    • 11559eb2 - Version 8.7.0-rc1-ee
    • 152b5826 - Version 8.7.0-rc1
    • f024fd2b - Merge branch 'master' into 8-7-stable
    • 109068ba - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 87-sync-rc2
    • 572335cc - Merge branch 'master' into 87-sync-rc2
    • 73778127 - Merge branch '87-sync-rc2' into '8-7-stable-ee'
    • d7c647f5 - Merge branch 'master' into 8-7-stable
    • ab70ccbd - Merge branch 'master' into 8-7-stable-ee
    • 842ce1e9 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • 221072be - Version 8.7.0-rc2-ee
    • 265f796b - Version 8.7.0-rc2
    • a33095d4 - Fix problem when creating milestones in groups without projects
    • cc52d475 - Improve code
    • 8828e45c - Improve code
    • ea83df0f - Add specs for sessions controller including 2FA
    • e834fbb4 - Disable git gc --auto
    • 6842dc66 - Expire caches after project creation to ensure a consistent state
    • 9933b52c - Fix 2FA authentication spoofing vulnerability
    • eb71685f - Hide "assign to me" link if not allowed
    • 5f4cd125 - Make sessions controller specs more explicit
    • 5a18d82a - Add optional colon.
    • 1e053285 - Remove duplication. Remove JS data attributes
    • 5a20d561 - Remove dumb debug statement and add many tests.
    • e349d1d3 - CHANGELOG
    • f47e511b - Implement review suggestions
    • 70ba0294 - Update number of Todos in the sidebar when it's marked as "Done"
    • f4db5fd7 - Preserve white space
    • 853e417d - Indentation update
    • c2fcdad1 - Update CHANGELOG
    • d5831ab7 - Fix side-by-side code format & commit message wrap
    • 2d5845a0 - Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"
    • 621d6144 - Revert "Merge branch 'new-navigation-prototype' into 'master'"
    • 0ecfbcc0 - Remove changelog entry for new navigation sidebar.
    • 72bca707 - Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7
    • ef443449 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • 9cf3ed45 - Merge branch 'master' into 8-7-stable-ee
    • f1bdb827 - Version 8.7.0-rc3-ee
    • 4f55c78d - Version 8.7.0-rc3
    • 731ac99d - Merge branch '8-7-stable-ee' of gitlab.com:gitlab-org/gitlab-ee into 8-7-stable-ee
    • 810165cc - Merge branch 'master' into 8-7-stable-ee
    • fe31059b - Merge branch 'master' into 8-7-stable
    • f8a08b11 - Merge branch 'master' into 8-7-stable-ee
    • 2fe0aba2 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • 38720263 - Merge branch 'master' into 8-7-stable
    • 32df7918 - Merge branch 'master' into 8-7-stable-ee
    • 63ff32ee - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • a9a68f67 - Version 8.7.0-rc4-ee
    • c4da1463 - Version 8.7.0-rc4
    • 377b59da - Sanitize branch names for confidential issues.
    • 5d88de09 - Refactor Issue#related_branches
    • 91034af3 - Augment the tests for Issue#related_branches
    • 66ca8018 - Test the Issue#to_branch_name method.
    • 8dd1a6fc - Fix the rubocop check.
    • 769a8bf7 - Update CHANGELOG
    • c4393a10 - Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches
    • f5ce601c - Make a few style changes based on MR feedback.
    • 953bafff - Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches
    • 989dd2c1 - Merge branch 'master' into 8-7-stable
    • 1d5fd748 - Merge branch 'master' into 8-7-stable-ee
    • 41c196a1 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • cfecca5c - Version 8.7.0-rc5-ee
    • 83e7e5c0 - Version 8.7.0-rc5
    • fa7d99eb - API: Present an array of Gitlab::Git::Tag instead of array of rugged tags
    • 7cc23952 - Remove persistent XSS vulnerability in commit_person_link helper
    • aa396ae5 - Remove unused variable in IssuesController.
    • fce97dfc - "git lfs init" is deprecated, use "git lfs install" instead.
    • 17a73017 - Remove additional misuse of data-original-title attribute
    • fe603d4d - Removed aside toggle on profile pages
    • 7fa3a1c0 - Ensure that annoation is presented properly
    • f801e224 - A new branch created for a confidential issue is named <id>-confidential-issue.
    • c634d370 - Bump version to 8.8.0-pre
    • d1b2e7b4 - Trigger filtering after ajax is complete in dropdown
    • bfa16dbc - Merge branch 'api-fix-annotated-tags' into 'master'
    • 229f3ce9 - Configuring of points per UDP packet
    • 2011f02b - Merge branch 'dropdown-filter-after-load' into 'master'
    • 0063194a - Merge branch 'profile-aside-toggle' into 'master'
    • 60942bf5 - Merge branch 'rs-issue-15126' into 'master'
    • 9bab0984 - Merge branch 'patch-1' into 'master'
    • eb467aeb - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • af06431c - Merge branch 'bump-version' into 'master'
    • a04e5b4e - Merge branch 'toggle-points-per-packet' into 'master'
    • 18a8844f - Merge branch '14566-confidential-issue-branches' into 'master'
    • f6fbd0fb - Merge branch 'master' into 8-7-stable
    • 8d1b82ac - format merge request references properly
    • fd4c8333 - Add support to cherry-pick any commit
    • c50f2e15 - Fix GitHub project's link on import page when provider has a custom URL
    • b35600f5 - Merge branch 'master' into 8-7-stable-ee
    • 4d61f0ee - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • 118daa70 - CLearify shared runner warning.
    • b0bb5614 - Remove XSS vulnerability in Label and Milestone dropdowns
    • e2903f28 - Merge branch '15139-fix-constants-redefinition-warnings' into 'master'
    • 413ff5b3 - Merge branch 'issue_15390' into 'master'
    • b255cbf3 - Merge branch 'slack_wiki_notifications' into 'master'
    • aa49124e - Merge branch 'feature/raw-trace-output' into 'master'
    • 69821f1a - Merge branch 'license-templates-and-api-12804' into 'master'
    • 6f9a97aa - Merge branch 'feature/geo-reposync-systemhook' into 'master'
    • fa0e6289 - Version 8.7.0-rc6-ee
    • dcd4829c - Version 8.7.0-rc6
    • 4715ab91 - Merge branch 'issue_14678' into 'master'
    • 54851c01 - Merge branch 'multi-filter-labels' into 'master'
    • 223c64f8 - Merge branch 'feature/incremental-build-trace-update' into 'master'
    • c0acc321 - Merge branch 'fix-mr-cherry-pick-without-merge-commit' into 'master'
    • 316a6b3b - Merge branch 'new-mr-layout-fix' into 'master'
    • 808038be - Merge branch 'system-note-commented' into 'master'
    • 6f11c35a - Merge branch 'edit-link-anchor-stop' into 'master'
    • 0907e863 - Merge branch 'issue_15366' into 'master'
    • 523f7abe - Merge branch 'remove-duplicate-ids' into 'master'
    • e1c99358 - Merge branch '15213-dialog-input' into 'master'
    • 73b8072d - Merge branch 'right-sidebar-z-index' into 'master'
    • cf69f9ca - Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master'
    • 052424f3 - Merge branch 'changelog-updates' into 'master'
    • 7046aedd - Merge branch 'sentry-js' into 'master'
    • 82d8c74f - Merge branch 'due-date-frontend' into 'master'
    • d793dc8b - Merge branch 'revert-diff-scroll' into 'master'
    • 166ef222 - Merge branch 'fix-grape-internal-allowed-action' into 'master'
    • b61927e5 - Merge branch '15104-mobile-comment-bug' into 'master'
    • 15f62ed6 - Merge branch 'note-form-text-color' into 'master'
    • ad016cbd - Merge branch 'fix/cross-project-labels-project-reference' into 'master'
    • ee6f941a - Merge branch 'add-pg-trgrm-in-migration' into 'master'
    • 52e53e0d - Merge branch 'disable_spellcheck_for_username_field' into 'master'
    • f7e09d0f - Fixed the CHANGELOG
    • 09100b61 - Merge branch 'doc/geo-development' into 'master'
    • 02c26e01 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • f59c134f - Merge branch 'revert-sentry-js' into 'master'
    • 4b50f5a0 - Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-7-stable-ee
    • 5081da21 - Version 8.7.0-rc7-ee
    • 4b77ab5e - Fix slack and hipchat notifications for merge request approvals
    • 6a26add1 - Code Style and added changes to the Changelog. 🍺
  • Gabriel Mazetto Added ~149424 label

    Added ~149424 label

  • Reassigned to @rspeicher

  • @brodock Why are we getting 128 commits? Is this in the wrong repo?

  • Reassigned to @brodock

  • Author Maintainer

    @rspeicher wow, I just rebased it, hold on.

  • Gabriel Mazetto Added 10 commits:

    Added 10 commits:

    • 6a26add1...3bbd9a77 - 9 commits from branch master
    • 6594dad1 - Fix slack and hipchat notifications for merge request approvals 🍺
  • Reassigned to @rspeicher

  • Author Maintainer

    @rspeicher fixed :)

  • @brodock LGTM, let's move it to 8.7.1.

  • Reassigned to @brodock

  • Gabriel Mazetto Added 281 commits:

    Added 281 commits:

    • 6594dad1...75136cc0 - 280 commits from branch master
    • 431d0b0a - Fix slack and hipchat notifications for merge request approvals 🍺
  • Author Maintainer

    Source branch patch/fix-merge-request-notifications does not exist Please restore the source branch or close this merge request and open a new merge request with a different source branch.

    This is wrong, branch stills there. (I did a forced push)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading