Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
gajim
gajim
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 195
    • Issues 195
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 20
    • Merge Requests 20
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gajim
  • gajimgajim
  • Merge Requests
  • !624

Open
Opened May 13, 2020 by Link Mauve@linkmauveContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://dev.gajim.org/linkmauve/gajim.git" "dont-display-priority"
git checkout -b "linkmauve/gajim-dont-display-priority" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "linkmauve/gajim-dont-display-priority"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Stop displaying priority in the roster and vcard views

  • Overview 1
  • Commits 1
  • Pipelines 2
  • Changes 4

Priority is a remnant of the pre-carbons world, where it would be used by the server of the recipient to choose which resource to route an incoming message to, when addressed to the bare JID.

Nowadays carbons is widespread enough that it makes sense to stop displaying this old bit of information.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gajim/gajim!624
Source branch: dont-display-priority