Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
W
weather-model
  • Project
    • 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
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • open-source
  • weather-model
  • Merge Requests
  • !1

Merged
Opened May 16, 2017 by Ivan Lan@mumumumushu 
  • Report abuse
Report abuse

Lan/basic frame

Add db mysql, ohm, factory_girl

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b lan/basic_frame origin/lan/basic_frame

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 lan/basic_frame

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 15
  • Changes 17
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ivan Lan @mumumumushu

    assigned to @liyijie

    May 16, 2017

    assigned to @liyijie

    assigned to @liyijie
    Toggle commit list
  • Ivan Lan @mumumumushu

    merged

    May 16, 2017

    merged

    merged
    Toggle commit list
  • Ivan Lan @mumumumushu

    mentioned in commit 6b676a53

    May 16, 2017

    mentioned in commit 6b676a53

    mentioned in commit 6b676a53e49ee645c4d4302b72c3e384f3616f16
    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
liyijie
Assignee
liyijie @liyijie
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: open-source/weather-model!1
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.