Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
briar
briar
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 579
    • Issues 579
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • briar
  • briarbriar
  • Merge Requests
  • !850

Closed
Opened Jun 28, 2018 by Julian Dehm@goapunk
  • Report abuse
Report abuse

WIP: Add special purpose contacts

First approach to distinguishable contact types:

  • Start with four contact types (CONTACT, PRIVATE_MAILBOX, CONTACT_MAILBOX and MAILBOX_OWNER)
  • getContacts will only return regular contacts, getAllContacts() will return contacts of every type
  • ContactHooks now declare which type of contacts they want to receive.
  • Adds a database migration
Edited Aug 27, 2018 by Julian Dehm

Check out, review, and merge locally

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

-# All repo/branch refs have been quoted to allow support for special characters (such as #my-branch)
git fetch "https://code.briarproject.org/goapunk/briar.git" "add_special_purpose_contacts"
git checkout -b "goapunk/briar-add_special_purpose_contacts" 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 "goapunk/briar-add_special_purpose_contacts"

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.

  • Discussion 65
  • Commits 6
  • Pipelines 21
  • Changes 36
Assignee
Assign to
Mailbox
Milestone
Mailbox
Assign milestone
Time tracking
1
Labels
Rejected
Assign labels
  • View project labels
Reference: briar/briar!850