Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !304

Merged
Opened Mar 09, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

reportLockUserNameとsendBackUserNameをローカルDB内に保存する際に、難読化するようにした。

Daoで暗号化と複合を行い、他に影響を与えないように実装した。

  • ロック時のダイアログ、差し戻し報告の承認者欄で正常に表示されるのを確認した。
  • ローカルDB内で暗号化されていることを目視確認した。
Edited Mar 09, 2023 by Kazuyuki Hida
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/contract/sato/1.0.300_encrypt origin/feature/contract/sato/1.0.300_encrypt

Step 2. Review the changes locally

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

git checkout contract/sato/1.0.300
git merge --no-ff feature/contract/sato/1.0.300_encrypt

Step 4. Push the result of the merge to GitLab

git push origin contract/sato/1.0.300

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

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

  • Discussion 0
  • Commits 1
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida @hida-k

    changed the description

    Mar 09, 2023

    changed the description

    changed the description
    Toggle commit list
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Mar 09, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Yujin Seo @seo

    merged

    Mar 09, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit 66104d4f

    Mar 09, 2023

    mentioned in commit 66104d4f

    mentioned in commit 66104d4fa66e373ca1dbb9043ea04a4e59385116
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Yujin Seo
Assignee
Yujin Seo @seo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!304
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.