Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
M
messagingframework
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • mer-core
  • messagingframework
  • Merge Requests
  • !36

Open
Opened Dec 19, 2019 by flypig@flypig
  • Report abuse
Report abuse

WIP: Respect folder SynchronizationEnabled flags only for full sync

  • Overview 5
  • Commits 1
  • Changes 2

If a full sync is performed, only folders with the SynchronizationEnabled flag will be synced. This change makes it so that when individual folders are synced the flag is ignored. In other words, when the user refreshes an individual folder, it will be synced independent of the flag.

This allows the user to configure (using the folders' SynchronizedEnabled flags) which folders should be synchronised when a full sync is performed, without it affected the ability to explicitly update an individual folder.

Edited Jan 17, 2020 by flypig

Check out, review, and merge locally

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

git fetch "https://git.sailfishos.org/flypig/messagingframework.git" "jb47389"
git checkout -b "flypig/messagingframework-jb47389" 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 "origin/master"
git merge --no-ff "flypig/messagingframework-jb47389"

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.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/messagingframework!36