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

Merged
Opened Sep 13, 2021 by Kim Jinsung@kim_j 2 of 2 tasks completed2/2 tasks
  • Report abuse
Report abuse

Bug #44047【ABook Communication】文書協業中にPIPモードではホスト変更ができない。

・作業一覧画面からプッシュメッセージ受信でチャットルーム接続できない問題対応 ・プッシュメッセージ受信情報からroomType取得しないように修正サーバ側でroomType=null送られてエラー発生

Reviewer

LGTMの場合、チェックをしてください。

  • @kim-p
  • @onuma
Edited Sep 13, 2021 by Kim Peace
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b communication/develop_kimjs origin/communication/develop_kimjs

Step 2. Review the changes locally

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

git checkout communication/develop
git merge --no-ff communication/develop_kimjs

Step 4. Push the result of the merge to GitLab

git push origin communication/develop

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 4
  • Changes 9
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • onuma @onuma

    marked the task @onuma as completed

    Sep 13, 2021

    marked the task @onuma as completed

    marked the task **@onuma** as completed
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Sep 13, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @kim_j

    Sep 13, 2021

    assigned to @kim_j

    assigned to @kim_j
    Toggle commit list
  • Kim Jinsung @kim_j

    merged

    Sep 13, 2021

    merged

    merged
    Toggle commit list
  • Kim Jinsung @kim_j

    mentioned in commit 96ae6880

    Sep 13, 2021

    mentioned in commit 96ae6880

    mentioned in commit 96ae6880850dde60b9c09b8b8c246f9623c6937e
    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
Kim Jinsung
Assignee
Kim Jinsung @kim_j
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abook_android/abook_check!233
×

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.