Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
C
chat_webview
  • 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
  • abookCommunication
  • chat_webview
  • Merge Requests
  • !191

Merged
Opened Jul 06, 2021 by Kim Peace@kim-p 1 of 2 tasks completed1/2 tasks
  • Report abuse
Report abuse

Design/playground

  • @sasaki-t
  • @kim_j
Edited Jul 08, 2021 by Kim Jinsung
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b design/playground origin/design/playground

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff design/playground

Step 4. Push the result of the merge to GitLab

git push origin 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 6
  • Changes 75
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace @kim-p

    changed the description

    Jul 06, 2021

    changed the description

    changed the description
    Toggle commit list
  • Kim Peace @kim-p

    changed the description

    Jul 06, 2021

    changed the description

    changed the description
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @sasaki-t

    Jul 06, 2021

    assigned to @sasaki-t

    assigned to @sasaki-t
    Toggle commit list
  • 藤川諒 @fujikawa-r

    added 1 commit

    • 2ea8c239 - 音声共有、文書共有レイアウト修正

    Compare with previous version

    Jul 06, 2021

    added 1 commit

    • 2ea8c239 - 音声共有、文書共有レイアウト修正

    Compare with previous version

    added 1 commit * 2ea8c239 - 音声共有、文書共有レイアウト修正 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/191/diffs?diff_id=6570&start_sha=6ec7a3a7f25ac5c382845c29014a83baf7f09d9a)
    Toggle commit list
  • Kim Peace @kim-p

    merged

    Jul 08, 2021

    merged

    merged
    Toggle commit list
  • Kim Peace @kim-p

    mentioned in commit d10b9423

    Jul 08, 2021

    mentioned in commit d10b9423

    mentioned in commit d10b9423d147389d8b703a7071a324b24a8f06e3
    Toggle commit list
  • Kim Jinsung @kim_j

    marked the task @kim_j as completed

    Jul 08, 2021

    marked the task @kim_j as completed

    marked the task **@kim_j** as completed
    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
takashi sasaki
Assignee
takashi sasaki @sasaki-t
Assign to
None
Milestone
None
Assign milestone
Time tracking
4
4 participants
Reference: abookCommunication/chat_webview!191
×

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.