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

Merged
Opened Sep 06, 2021 by Kim Eunchul@kim-ec 
  • Report abuse
Report abuse

Communication/develop kim ec

×

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_kim-ec origin/communication/develop_kim-ec

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_kim-ec

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 2
  • Commits 4
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Sep 06, 2021
    Last updated by Kim Eunchul Sep 06, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/PushMessageJSON.java
    99 if (message.contains(ABookCommConstants.INVITE_COLLABORATION)) {
    100 String[] inviteMessage = message.split(ABookCommConstants.CHAT_MESSAGE_SEPERATOR);
    101 return inviteMessage[1];
    102 if (message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.ENG) ||
    103 message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.JP) ||
    104 message.contains(ABookCommConstants.COLLABORATION.INVITE_COLLABORATION.KR)) {
    105
    106 return CollaborationTypeToNum(message);
    102 107 }
    103 108 return jsonObject.getString(AppDefType.ChatPushMessageKey.collaborationType);
    104 109 } catch (Exception e) {
    105 110 return "";
    106 111 }
    107 112 }
    113
    114 public String CollaborationTypeToNum(String message) {
    • Kim Peace @kim-p commented Sep 06, 2021
      Master

      [nits] methodの名前は小文字ではなまるようにしてください。

      methodは動詞から始まるようにしてください。

      ex) convertCollaborationTypeToNum(...

      [nits] methodの名前は小文字ではなまるようにしてください。 methodは動詞から始まるようにしてください。 ex) convertCollaborationTypeToNum(...
    • Kim Eunchul @kim-ec

      changed this line in version 2 of the diff

      Sep 06, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/219/diffs?diff_id=7118&start_sha=ff74982106828f8fdebbf5bb035b5e9bfea18509#fedf4e20fa2f7b945b0708d90424fe8dab181c18_114_114)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Sep 06, 2021
    Last updated by Kim Eunchul Sep 06, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
    159 159 Integer MESSAGE_PAGING_SIZE = 100;
    160 160 }
    161 161
    162 interface COLLABORATION {
    163 interface INVITE_COLLABORATION {
    164 String ENG = "inviteCollaboration";
    • Kim Peace @kim-p commented Sep 06, 2021
      Master

      [nits] 頭文字を2文字にするのか3文字にするのかを統一してください。

      ENG JPN KOR

      または

      EN JP KR

      [nits] 頭文字を2文字にするのか3文字にするのかを統一してください。 ENG JPN KOR または EN JP KR
    • Kim Eunchul @kim-ec

      changed this line in version 3 of the diff

      Sep 06, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/219/diffs?diff_id=7119&start_sha=c1cbc3ca9cb6bfd0a7888369b31cae6262228828#d7cb729fc160d94ec42521a6742049033fb46a9f_164_164)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    assigned to @kim-ec

    Sep 06, 2021

    assigned to @kim-ec

    assigned to @kim-ec
    Toggle commit list
  • Kim Eunchul @kim-ec

    added 1 commit

    • c1cbc3ca - 協業招待プッシュメッセージ方法変更

    Compare with previous version

    Sep 06, 2021

    added 1 commit

    • c1cbc3ca - 協業招待プッシュメッセージ方法変更

    Compare with previous version

    added 1 commit * c1cbc3ca - 協業招待プッシュメッセージ方法変更 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/219/diffs?diff_id=7118&start_sha=ff74982106828f8fdebbf5bb035b5e9bfea18509)
    Toggle commit list
  • Kim Eunchul @kim-ec

    added 1 commit

    • 0f31ee16 - 協業招待プッシュメッセージ方法変更

    Compare with previous version

    Sep 06, 2021

    added 1 commit

    • 0f31ee16 - 協業招待プッシュメッセージ方法変更

    Compare with previous version

    added 1 commit * 0f31ee16 - 協業招待プッシュメッセージ方法変更 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/219/diffs?diff_id=7119&start_sha=c1cbc3ca9cb6bfd0a7888369b31cae6262228828)
    Toggle commit list
  • Kim Eunchul @kim-ec

    assigned to @kim-p

    Sep 06, 2021

    assigned to @kim-p

    assigned to @kim-p
    Toggle commit list
  • Kim Eunchul @kim-ec

    merged

    Sep 06, 2021

    merged

    merged
    Toggle commit list
  • Kim Eunchul @kim-ec

    mentioned in commit 3ceba6c7

    Sep 06, 2021

    mentioned in commit 3ceba6c7

    mentioned in commit 3ceba6c7600619c98725c6c1a2d4e871c99f5b45
    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 Peace
Assignee
Kim Peace @kim-p
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!219
×

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.