Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 864
    • Issues 864
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 42
    • Merge Requests 42
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !475

Open
Opened 6 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/KiltedKoala](chore): Adding in fdescribe / fit checks in git hooks #1608

Partially closes #1608

Try commit an fdescribe or fit.

Edited 6 hours ago by Ben Hayward

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/fdesc-hook-1608 origin/feat/fdesc-hook-1608

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff feat/fdesc-hook-1608

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.

Request to merge feat/fdesc-hook-1608 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #74826603 running for b46a5087 on feat/fdesc-hook-1608
            Merge request approved. Approved by
            Brian Hatchet
            Brian Hatchet
            Mark Harding
            Mark Harding
            Emiliano Balbuena
            Emiliano Balbuena
            Martin Santangelo
            Martin Santangelo
            Guy Thouret
            Guy Thouret
            Marcelo Rivera
            Marcelo Rivera
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request

            Closes #1608

            Deletes source branch

            • Discussion 3
            • Commits 5
            • Pipelines 5
            • Changes 3
            • Loading...
            • Ben Hayward @benhayward.ben changed the description 6 hours ago

              changed the description

            • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Green scoped labels 6 hours ago

              added MR::Awaiting Review Squad::Green scoped labels

            • Ben Hayward
              Ben Hayward @benhayward.ben · 6 hours ago
              Developer

              One thing to note, these may not work unless "chmod +x .githooks/pre-commit" is ran. I've omitted that for now else we'll run into compat issues with Windows - Could use something like this if that is the case https://stackoverflow.com/a/8597411/7396007.

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 hour ago

              added 1 commit

              • f4c0de6d - Testing fdesc

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 50 minutes ago

              added 1 commit

              • 297edfb9 - Revert "Testing fdesc"

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 4 minutes ago

              added 1 commit

              • b46a5087 - Making executable

              Compare with previous version

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 1 minute ago
              Developer

              Just had to made it executable and it works in the happy path case. Aka, if there is no f* in the code, it won't let you add them. However, there's a problem in the script if you try to remove and existing one. It will detect the change and pick it up as a potential add even if it's a -fdescribe line

              It also requires NPM to be installed, so we'll need to broadcast to all developers that they need to update their locals so it sticks.

            • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request just now

              approved this merge request

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · just now
              Developer

              Approved, but this one definitely requires @markeharding 's blessing

            • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
            Please register or sign in to reply
            0 Assignees
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            2
            Labels
            MR::Awaiting Review Squad::Green
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Mark Harding
            user avatar
            Emiliano Balbuena
            user avatar
            Martin Santangelo
            user avatar
            Guy Thouret
            user avatar
            Marcelo Rivera
            user avatar
            Olivia Madrid
            user avatar
            Juan Manuel Solaro
            Reference: minds/front!475