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 !82 opened 2023-11-28 22:44:56 UTC by Ryan@ryan

28823_chatbot_vuzo_link

Edited 2023-12-20 03:45:28 UTC
Request to merge 28823_chatbot_vuzo_link into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b 28823_chatbot_vuzo_link origin/28823_chatbot_vuzo_link

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 28823_chatbot_vuzo_link

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.

Merged

The changes were merged into master.

  • Discussion 1
  • Commits 8
  • Changes 4
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ryan
    @ryan

    added 1 commit

    • 2704b2d5 - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-11-29 05:12:43 UTC

    added 1 commit

    • 2704b2d5 - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • ba0e8abc - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-11-29 05:13:35 UTC

    added 1 commit

    • ba0e8abc - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Toggle discussion
    Janis
    @janis started a discussion on an outdated diff 2023-11-30 23:55:27 UTC
    client/public/index.html
    50 <script>
    51 const hostname = window.location.hostname;
    52 const segments = hostname.split('.');
    53 const firstSegment = segments[0];
    54 let server = '';
    55
    56 if(firstSegment === 'dev'){
    57 server = '//dev.'
    58 } else if (firstSegment === 'staging'){
    59 server = '//staging.'
    60 } else {
    61 server = '//'
    62 }
    63
    64 var script = document.createElement("script")
    65 script.setAttribute("src", server + `start.ai-pro.org/snippets/com.global.vuzo.js`)
    • Janis
      @janis commented 2023-11-30 23:55:27 UTC
      Master

      use ENV VARIABLE; see how REACT_APP_BTUTIL_ASSET_URL is implemented

  • Ryan
    @ryan

    added 1 commit

    • b7c70c79 - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-12-01 02:14:22 UTC

    added 1 commit

    • b7c70c79 - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 00672bac - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-12-11 03:50:23 UTC

    added 1 commit

    • 00672bac - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 6a7eec90 - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-12-11 07:52:14 UTC

    added 1 commit

    • 6a7eec90 - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 68ac8f97 - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-12-12 00:06:58 UTC

    added 1 commit

    • 68ac8f97 - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 01d9c5f2 - 28823_chatbot_vuzo_link

    Compare with previous version

    2023-12-20 00:56:18 UTC

    added 1 commit

    • 01d9c5f2 - 28823_chatbot_vuzo_link

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    unmarked as a Work In Progress

    2023-12-20 03:44:05 UTC

    unmarked as a Work In Progress

    Toggle commit list
  • Ryan
    @ryan

    mentioned in commit ffff6c02

    2023-12-20 03:45:28 UTC

    mentioned in commit ffff6c02

    Toggle commit list
  • Ryan
    @ryan

    merged

    2023-12-20 03:45:28 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
2
2 participants
Reference: baytech/chatgpt.ai-pro.org!82
×

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.