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 !3 opened 2023-02-02 03:47:41 UTC by Ryan@ryan

wip: fix_master_updated_ui

Edited 2023-02-07 10:53:15 UTC
Request to merge fix_master_updated_ui 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 fix_master_updated_ui origin/fix_master_updated_ui

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 fix_master_updated_ui

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 2
  • Commits 19
  • Changes 15
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Ryan
    @ryan

    added 1 commit

    • 89560363 - fix

    Compare with previous version

    2023-02-02 03:59:50 UTC

    added 1 commit

    • 89560363 - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 4f4ab7d7 - fix

    Compare with previous version

    2023-02-02 04:01:58 UTC

    added 1 commit

    • 4f4ab7d7 - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 792924ee - fixes

    Compare with previous version

    2023-02-02 04:02:21 UTC

    added 1 commit

    • 792924ee - fixes

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 7f9010bc - fix

    Compare with previous version

    2023-02-02 04:21:27 UTC

    added 1 commit

    • 7f9010bc - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 5fbcb51a - settings

    Compare with previous version

    2023-02-02 06:03:36 UTC

    added 1 commit

    • 5fbcb51a - settings

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • e03bc109 - fix

    Compare with previous version

    2023-02-02 07:43:22 UTC

    added 1 commit

    • e03bc109 - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 94162ec9 - fix

    Compare with previous version

    2023-02-02 11:05:18 UTC

    added 1 commit

    • 94162ec9 - fix

    Compare with previous version

    Toggle commit list
  • Toggle discussion
    Janis
    @janis started a discussion on an outdated diff 2023-02-02 11:13:51 UTC
    .env 0 → 100644
    1 API_KEY="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"
    2 API_ORG="org-2OIAoj4fSwE4RCzgvglUM55T"
    3 LOCALHOST="http://localhost:3080/"
    • Janis
      @janis commented 2023-02-02 11:13:51 UTC
      Master

      @ryan what is the LOCALHOST here?

  • Toggle discussion
    Janis
    @janis started a discussion on the diff 2023-02-02 11:16:13 UTC
    client/.gitignore
    2 2
    3 3 # dependencies
    4 4 /node_modules
    • Janis
      @janis commented 2023-02-02 11:16:13 UTC
      Master

      add .env in gitgnore

      add a new file with filename env-template with key names and blank values

      API_KEY= use specific API KEY; we can also add API Key for Stripe
      API_ORG= use specific ORG KEY; 
      LOCALHOST= (?) not a good envVar name; use SERVER_URL instead
      
      Edited 2023-02-02 11:29:26 UTC
  • Ryan
    @ryan

    added 1 commit

    • 73fc70fe - fixes

    Compare with previous version

    2023-02-02 11:36:10 UTC

    added 1 commit

    • 73fc70fe - fixes

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 0634b3ad - fix

    Compare with previous version

    2023-02-02 12:03:50 UTC

    added 1 commit

    • 0634b3ad - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 827420b8 - fix

    Compare with previous version

    2023-02-02 12:06:52 UTC

    added 1 commit

    • 827420b8 - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 3f72939f - fix

    Compare with previous version

    2023-02-02 12:09:26 UTC

    added 1 commit

    • 3f72939f - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 2 commits

    • 6572b9be - fix
    • 8edd7bfb - readme

    Compare with previous version

    2023-02-03 01:03:28 UTC

    added 2 commits

    • 6572b9be - fix
    • 8edd7bfb - readme

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • b22f9a7b - readme

    Compare with previous version

    2023-02-03 01:05:09 UTC

    added 1 commit

    • b22f9a7b - readme

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 57432129 - env

    Compare with previous version

    2023-02-03 05:17:11 UTC

    added 1 commit

    • 57432129 - env

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 8b0ccf90 - fixes

    Compare with previous version

    2023-02-03 08:14:06 UTC

    added 1 commit

    • 8b0ccf90 - fixes

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 64bb4f9d - theme

    Compare with previous version

    2023-02-03 09:12:18 UTC

    added 1 commit

    • 64bb4f9d - theme

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    added 1 commit

    • 7ac4ddf0 - fix

    Compare with previous version

    2023-02-03 09:23:00 UTC

    added 1 commit

    • 7ac4ddf0 - fix

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    merged

    2023-02-07 10:53:15 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!3