Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
Falcon
  • 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
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Walter Huang
  • Falcon
  • Merge Requests
  • !2

Merged
Opened Jul 03, 2025 by Lin Wang@lin.wang 
  • Report abuse
Report abuse

Feat detect master if publish

Spec: https://strikingly.atlassian.net/wiki/spaces/SPEC/pages/3754328403/L5-+card+color+fix

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat-detect-master-if-publish origin/feat-detect-master-if-publish

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff feat-detect-master-if-publish

Step 4. Push the result of the merge to GitLab

git push origin develop

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

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

  • Discussion 8
  • Commits 4
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lin Wang @lin.wang

    changed target branch from main to develop

    Jul 03, 2025

    changed target branch from main to develop

    changed target branch from `main` to `develop`
    Toggle commit list
  • Lin Wang @lin.wang

    added 1 commit

    • 7b54de04 - feat: detect the master site if publishing

    Compare with previous version

    Jul 03, 2025

    added 1 commit

    • 7b54de04 - feat: detect the master site if publishing

    Compare with previous version

    added 1 commit <ul><li>7b54de04 - feat: detect the master site if publishing</li></ul> [Compare with previous version](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109954&start_sha=a40f37c370c9d045a5465541ca40a6aec32f9bf7)
    Toggle commit list
  • Walter Huang
    @walter.huang started a discussion on an old version of the diff Jul 04, 2025
    Resolved by Walter Huang Jul 04, 2025
    index.ts
    Unable to load the diff.
    • Walter Huang @walter.huang commented Jul 04, 2025
      Master

      这个有时区问题

      这个有时区问题
    • Walter Huang @walter.huang commented Jul 04, 2025
      Master
      import { DateTime } from 'luxon';
      
      function isBeijingMonday11AM() {
        const now = DateTime.now().setZone('Asia/Shanghai'); // 明确设定为北京时间
        return now.weekday === 1 && now.hour === 11;
      }
      Edited Jul 04, 2025 by Walter Huang
      ``` import { DateTime } from 'luxon'; function isBeijingMonday11AM() { const now = DateTime.now().setZone('Asia/Shanghai'); // 明确设定为北京时间 return now.weekday === 1 && now.hour === 11; } ```
    • Walter Huang @walter.huang commented Jul 04, 2025
      Master

      bun add luxon

      `bun add luxon`
    • Haohao Jiang @haohao.jiang

      changed this line in version 4 of the diff

      Jul 04, 2025

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109966&start_sha=7b54de04dc292dca970c04016c03be1fa1af3c66#a123abce010ea7d96fa76c6a9040950b5dac59bc_104_104)
      Toggle commit list
    Please register or sign in to reply
  • Walter Huang
    @walter.huang started a discussion on an old version of the diff Jul 04, 2025
    Resolved by Walter Huang Jul 07, 2025
    index.ts
    Unable to load the diff.
    • Walter Huang @walter.huang commented Jul 04, 2025
      Master

      这个默认是移步吧?

      需要用 Bun.spawnSync

      上面的写法其实是用非阻塞但 await 做同步等待,推荐直接同步

      Edited Jul 04, 2025 by Walter Huang
      这个默认是移步吧? 需要用 Bun.spawnSync 上面的写法其实是用非阻塞但 await 做同步等待,推荐直接同步
    • Lin Wang @lin.wang

      changed this line in version 5 of the diff

      Jul 07, 2025

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109997&start_sha=1d6237f2cbb1883ee3a0a561e9bb117aa2f32a68#a123abce010ea7d96fa76c6a9040950b5dac59bc_41_41)
      Toggle commit list
    • Lin Wang @lin.wang commented Jul 07, 2025
      Master

      已修改

      已修改
    Please register or sign in to reply
  • Walter Huang
    @walter.huang started a discussion on an old version of the diff Jul 04, 2025
    Resolved by Walter Huang Jul 07, 2025
    index.ts
    Unable to load the diff.
    • Walter Huang @walter.huang commented Jul 04, 2025
      Master

      同上

      同上
    • Lin Wang @lin.wang

      changed this line in version 5 of the diff

      Jul 07, 2025

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109997&start_sha=1d6237f2cbb1883ee3a0a561e9bb117aa2f32a68#a123abce010ea7d96fa76c6a9040950b5dac59bc_58_62)
      Toggle commit list
    • Lin Wang @lin.wang commented Jul 07, 2025
      Master

      已修改

      已修改
    Please register or sign in to reply
  • Haohao Jiang @haohao.jiang

    added 1 commit

    • 1d6237f2 - fix: only trigger at Monday 11am in Beijing

    Compare with previous version

    Jul 04, 2025

    added 1 commit

    • 1d6237f2 - fix: only trigger at Monday 11am in Beijing

    Compare with previous version

    added 1 commit <ul><li>1d6237f2 - fix: only trigger at Monday 11am in Beijing</li></ul> [Compare with previous version](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109966&start_sha=7b54de04dc292dca970c04016c03be1fa1af3c66)
    Toggle commit list
  • Lin Wang @lin.wang

    added 2 commits

    • 3acf7279 - feat: add node version file
    • 515f1e5e - fix: change spawn to spawnSync

    Compare with previous version

    Jul 07, 2025

    added 2 commits

    • 3acf7279 - feat: add node version file
    • 515f1e5e - fix: change spawn to spawnSync

    Compare with previous version

    added 2 commits <ul><li>3acf7279 - feat: add node version file</li><li>515f1e5e - fix: change spawn to spawnSync</li></ul> [Compare with previous version](https://cd.i.strikingly.com/walter.huang/Falcon/merge_requests/2/diffs?diff_id=109997&start_sha=1d6237f2cbb1883ee3a0a561e9bb117aa2f32a68)
    Toggle commit list
  • Walter Huang @walter.huang

    resolved all discussions

    Jul 07, 2025

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Walter Huang @walter.huang commented Jul 07, 2025
    Master

    reviewed

    reviewed
  • Walter Huang @walter.huang

    merged

    Jul 07, 2025

    merged

    merged
    Toggle commit list
  • Walter Huang @walter.huang

    mentioned in commit 4c79b31e

    Jul 07, 2025

    mentioned in commit 4c79b31e

    mentioned in commit 4c79b31e7b287bcd62aef6f7d24e447c504faf0c
    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
Walter Huang
Assignee
Walter Huang @walter.huang
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: walter.huang/Falcon!2
×

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.