Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-8514

Missing Overview tab warning about conflicts in Pull Request when page loaded on Diff tab

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Low Low
    • 4.12.0
    • 4.1.0
    • Pull Requests
    • None

      Summary

      When there are pull-request with conflicts:

      • Opening the PR and Overview tab (default behaviour), there is an alert about the conflicts
      • Opening the PR on Diff or Commits tab and switching to Overview - the alert about conflicts will go missing

      Steps to Reproduce

      1. Have a repository with a file
      2. Create a pull request with conflicts on the file
      3. Look at the list of pull-requests and open conflicted one
      4. Overview tab should be opened by default
      5. At the top, below pull-request name, there should be an alert about the conflicts
      6. Switch to Diff or Commits tab
      7. Switch to Overview tab, alert about conflicts should still exist
      8. Switch to Diff or Commits tab
      9. Refresh page
      10. Switch to Overview tab
      11. Alert about conflicts will be missing

      Expected Results

      Overview tab should be showing the alert box about conflicts

      Actual Results

      Overview tab does not show the alert box about conflicts

          Form Name

            [BSERV-8514] Missing Overview tab warning about conflicts in Pull Request when page loaded on Diff tab

            Owen made changes -
            Workflow Original: Stash Workflow - Restricted [ 1446860 ] New: JAC Bug Workflow v3 [ 3137214 ]
            Owen made changes -
            Symptom Severity Original: Minor [ 14432 ] New: Severity 3 - Minor [ 15832 ]
            Marcin made changes -
            Fix Version/s New: 4.12.0 [ 64397 ]
            Resolution New: Fixed [ 1 ]
            Status Original: Open [ 1 ] New: Closed [ 6 ]

            Marcin added a comment -

            In 4.12 the "Conflicted" banner should correctly show when loading the page on a tab other than "Overview" and subsequently switching to the Overview tab.

            Marcin added a comment - In 4.12 the "Conflicted" banner should correctly show when loading the page on a tab other than "Overview" and subsequently switching to the Overview tab.
            Marcin made changes -
            Assignee New: Marcin [ mszczepanski ]
            Christian made changes -
            Remote Link New: This issue links to "Page (Extranet)" [ 226613 ]
            jonah (Inactive) made changes -
            Symptom Severity New: Minor [ 14432 ]
            Owen made changes -
            Workflow Original: Stash Workflow [ 1148280 ] New: Stash Workflow - Restricted [ 1446860 ]
            Adam Ahmed (Inactive) made changes -
            Summary Original: Missing alert about conflicts in Pull Request New: Missing Overview tab warning about conflicts in Pull Request when page loaded on Diff tab
            Adam Ahmed (Inactive) made changes -
            Status Original: Needs Triage [ 10030 ] New: Open [ 1 ]

              mszczepanski Marcin
              vchoo Vivian C
              Affected customers:
              1 This affects my team
              Watchers:
              5 Start watching this issue

                Created:
                Updated:
                Resolved: