Skip to content
  • This project
    • Loading...
  • Sign in

Administrator / chatgpt.ai-pro.org

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 3
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !54 opened 2023-04-12 00:24:42 UTC by Janis@janis

SYNC: master into 1DEVT

Edited 2023-09-01 06:28:07 UTC
Request to merge master into 1DEVT
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b master origin/master

Step 2. Review the changes locally

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

git checkout 1DEVT
git merge --no-ff master

Step 4. Push the result of the merge to GitLab

git push origin 1DEVT

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into 1DEVT.

  • Discussion 0
  • Commits 11
  • Changes 2
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ryan
    @ryan

    added 9 commits

    • 8df6621a...68aee7cc - 8 commits from branch 1DEVT
    • a978d3f7 - Merge branch '27190_loggedin' into 'master'

    Compare with previous version

    2023-04-17 06:40:28 UTC

    added 9 commits

    • 8df6621a...68aee7cc - 8 commits from branch 1DEVT
    • a978d3f7 - Merge branch '27190_loggedin' into 'master'

    Compare with previous version

    Toggle commit list
  • Janis
    @janis

    added 2 commits

    • d6a3790e - add mixpanel script
    • 790a6acb - Merge branch '27466_mixpanel_chatgpt+' into 'master'

    Compare with previous version

    2023-06-15 02:05:36 UTC

    added 2 commits

    • d6a3790e - add mixpanel script
    • 790a6acb - Merge branch '27466_mixpanel_chatgpt+' into 'master'

    Compare with previous version

    Toggle commit list
  • Jonille Arreglo
    @jonille

    added 1 commit

    • fc25e31a - add ver on btutil-common

    Compare with previous version

    2023-06-29 09:30:48 UTC

    added 1 commit

    • fc25e31a - add ver on btutil-common

    Compare with previous version

    Toggle commit list
  • Janis
    @janis

    added 7 commits

    • 04015176 - add authv2 script
    • 12d0d14c - update
    • 2cca589e - update
    • edffc5a0 - 27528_apply_authv2_chatgpt
    • 4dccedfe - Merge branch 'master' of https://gitlab.baytech.ph/baytech/chatgpt.ai-pro.org in…
    • 16c7e035 - 27528_apply_authv2_chatgpt
    • 57f63537 - Merge branch '27528_apply_authv2_chatgpt' into 'master'

    Compare with previous version

    2023-07-31 10:00:15 UTC

    added 7 commits

    • 04015176 - add authv2 script
    • 12d0d14c - update
    • 2cca589e - update
    • edffc5a0 - 27528_apply_authv2_chatgpt
    • 4dccedfe - Merge branch 'master' of https://gitlab.baytech.ph/baytech/chatgpt.ai-pro.org in…
    • 16c7e035 - 27528_apply_authv2_chatgpt
    • 57f63537 - Merge branch '27528_apply_authv2_chatgpt' into 'master'

    Compare with previous version

    Toggle commit list
  • Ian Rizh Mañago
    @ian

    merged

    2023-09-01 06:28:07 UTC

    merged

    Toggle commit list
  • Write
  • Preview
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
4
4 participants
Reference: baytech/chatgpt.ai-pro.org!54