Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
O
odakyuToiletSignage
  • 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
  • kddi
  • odakyuToiletSignage
  • Merge Requests
  • !1

Merged
Opened Jan 24, 2018 by Lee Jaebin@leej 
  • Report abuse
Report abuse

#28062 端末の日付がリセットされる問題対応

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b kddi/odakyuToiletSignage_1.0.0_leej origin/kddi/odakyuToiletSignage_1.0.0_leej

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff kddi/odakyuToiletSignage_1.0.0_leej

Step 4. Push the result of the merge to GitLab

git push origin master

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 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Jaebin @leej

    added 1 commit

    • 01d52765 - #28062 端末の日付がリセットされる問題対応(ロジック修正、ルート化端末チェック処理削除)

    Compare with previous version

    Jan 25, 2018

    added 1 commit

    • 01d52765 - #28062 端末の日付がリセットされる問題対応(ロジック修正、ルート化端末チェック処理削除)

    Compare with previous version

    added 1 commit * 01d52765 - #28062 端末の日付がリセットされる問題対応(ロジック修正、ルート化端末チェック処理削除) [Compare with previous version](https://gitlab.agentec.jp/kddi/odakyuToiletSignage/merge_requests/1/diffs?diff_id=1359&start_sha=3025b63d8b06634de4a4aaa5756d270ef3edba53)
    Toggle commit list
  • Lee Jaebin @leej

    added 1 commit

    • 4073ea50 - #28062 端末の日付がリセットされる問題対応(ロジック修正)

    Compare with previous version

    Jan 25, 2018

    added 1 commit

    • 4073ea50 - #28062 端末の日付がリセットされる問題対応(ロジック修正)

    Compare with previous version

    added 1 commit * 4073ea50 - #28062 端末の日付がリセットされる問題対応(ロジック修正) [Compare with previous version](https://gitlab.agentec.jp/kddi/odakyuToiletSignage/merge_requests/1/diffs?diff_id=1360&start_sha=01d527657628375f4b491af8b2aec65b68d8de1d)
    Toggle commit list
  • Lee Jaebin @leej

    closed

    Jan 25, 2018

    closed

    closed
    Toggle commit list
  • Lee Jaebin @leej

    reopened

    Jan 25, 2018

    reopened

    reopened
    Toggle commit list
  • Lee Jaebin @leej

    assigned to @leej

    Jan 25, 2018

    assigned to @leej

    assigned to @leej
    Toggle commit list
  • Lee Jaebin @leej

    assigned to @jang

    Jan 25, 2018

    assigned to @jang

    assigned to @jang
    Toggle commit list
  • Lee Jaebin @leej

    added 1 commit

    • 35a6c1c4 - #28062 NTPサーバのタイムスタンプJSON型のURLに変更

    Compare with previous version

    Jan 25, 2018

    added 1 commit

    • 35a6c1c4 - #28062 NTPサーバのタイムスタンプJSON型のURLに変更

    Compare with previous version

    added 1 commit * 35a6c1c4 - #28062 NTPサーバのタイムスタンプJSON型のURLに変更 [Compare with previous version](https://gitlab.agentec.jp/kddi/odakyuToiletSignage/merge_requests/1/diffs?diff_id=1362&start_sha=4073ea50f414b16e13aa800eef1159f50cb5bded)
    Toggle commit list
  • Kim Jinsung @kim_j

    mentioned in commit 31dd4c13

    Jan 25, 2018

    mentioned in commit 31dd4c13

    mentioned in commit 31dd4c13128813f5b404b6038a3d583e3f66dd52
    Toggle commit list
  • Kim Jinsung @kim_j

    merged

    Jan 25, 2018

    merged

    merged
    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
SC.Jang
Assignee
SC.Jang @jang
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: kddi/odakyuToiletSignage!1
×

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.