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

Merged
Opened Jul 02, 2019 by Jeong Gilmo@jeong-g 
  • Report abuse
Report abuse

#33721 絞り検索のAPIとの連携

  • 絞り検索のマスタデータのJSONファイル保存場所を修正
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b features/1.0.500_#33721 origin/features/1.0.500_#33721

Step 2. Review the changes locally

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

git checkout features/1.0.500
git merge --no-ff features/1.0.500_#33721

Step 4. Push the result of the merge to GitLab

git push origin features/1.0.500

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 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jeong Gilmo @jeong-g

    added 2 commits

    • 7175fb10 - 1 commit from branch features/1.0.500
    • 11cda975 - Merge branch 'features/1.0.500' into features/1.0.500_#33721

    Compare with previous version

    Jul 02, 2019

    added 2 commits

    • 7175fb10 - 1 commit from branch features/1.0.500
    • 11cda975 - Merge branch 'features/1.0.500' into features/1.0.500_#33721

    Compare with previous version

    added 2 commits * 7175fb10 - 1 commit from branch `features/1.0.500` * 11cda975 - Merge branch 'features/1.0.500' into features/1.0.500_#33721 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/14/diffs?diff_id=2297&start_sha=b4dca4c58b8ff5502f3c1590a2380dfd6bb2421d)
    Toggle commit list
  • Jeong Gilmo @jeong-g

    added 1 commit

    • fc31e60f - #33721 手書きパレット機能の追加

    Compare with previous version

    Jul 02, 2019

    added 1 commit

    • fc31e60f - #33721 手書きパレット機能の追加

    Compare with previous version

    added 1 commit * fc31e60f - #33721 手書きパレット機能の追加 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/14/diffs?diff_id=2298&start_sha=11cda975ce4118f229091f7978e72c0d4d9dd5b8)
    Toggle commit list
  • Jeong Gilmo @jeong-g

    added 1 commit

    • 328e905d - #33721 手書きパレット機能の追加

    Compare with previous version

    Jul 02, 2019

    added 1 commit

    • 328e905d - #33721 手書きパレット機能の追加

    Compare with previous version

    added 1 commit * 328e905d - #33721 手書きパレット機能の追加 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/14/diffs?diff_id=2302&start_sha=fc31e60fb9cc764d92ea9b45ef4beebddbabf628)
    Toggle commit list
  • Kim Jinsung @kim_j

    merged

    Jul 03, 2019

    merged

    merged
    Toggle commit list
  • Kim Jinsung @kim_j

    mentioned in commit 471da81d

    Jul 03, 2019

    mentioned in commit 471da81d

    mentioned in commit 471da81d5689674a3cf27c11207914466e0273f5
    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
2
2 participants
Reference: abook_android/abook_check!14
×

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.