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
  • !424

Open
Opened Apr 25, 2019 by Daniel Brötzmann@wurstsalatDeveloper
  • 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/wurstsalat/gajim.git" "add-httpupload-roster"
git checkout -b "wurstsalat/gajim-add-httpupload-roster" 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 "wurstsalat/gajim-add-httpupload-roster"

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.

Roster: Take HTTPUpload into consideration when sending file via context menu

  • Overview 6
  • Commits 3
  • Changes 3

When sending a file via context menu, filetransfer_preference will be used to choose the preferred file transfer method. This enables file transfers to offline contacts as well (if httpupload is the preference). Fixes #9041.

For a http_upload file transfer, a chat window is opened (if not already open/switch to it if open) and the file chooser dialog gets shown. I tested this with both file transfer preferences, multiple ressources, single ressource, and offline contacts.

Edited Nov 26, 2019 by Daniel Brötzmann
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gajim/gajim!424
Source branch: add-httpupload-roster