Skip to content

Remove "Express" Label from Civic Tech Jobs Page#8371

Merged
ryanfkeller merged 2 commits intohackforla:gh-pagesfrom
aymeviviana:remove-tech-express-8278
Oct 24, 2025
Merged

Remove "Express" Label from Civic Tech Jobs Page#8371
ryanfkeller merged 2 commits intohackforla:gh-pagesfrom
aymeviviana:remove-tech-express-8278

Conversation

@aymeviviana
Copy link
Member

@aymeviviana aymeviviana commented Oct 13, 2025

Fixes #8278

What changes did you make?

  • Removed the "Express" label from the Civic Tech Jobs page

Why did you make the changes (we will use this info to test)?

  • To keep the project technology information up to date.

CodeQL Alerts

After the PR has been submitted and the resulting GitHub actions/checks have been completed, developers should check the PR for CodeQL alert annotations.

Check the PR's comments. If present on your PR, the CodeQL alert looks similar as shown

Screenshot 2024-10-28 154514

Please let us know that you have checked for CodeQL alerts. Please do not dismiss alerts.

  • I have checked this PR for CodeQL alerts and none were found.
  • I found CodeQL alert(s), and (select one):
    • I have resolved the CodeQL alert(s) as noted
    • I believe the CodeQL alert(s) is a false positive (Merge Team will evaluate)
    • I have followed the Instructions below, but I am still stuck (Merge Team will evaluate)
Instructions for resolving CodeQL alerts

If CodeQL alert/annotations appear, refer to How to Resolve CodeQL alerts.

In general, CodeQL alerts should be resolved prior to PR reviews and merging

Screenshots of Proposed Changes To The Website (if any, please do not include screenshots of code changes)

Visuals before changes are applied civic_tech_jobs_page_before project_page_before
Visuals after changes are applied civic_tech_jobs_page_after project_page_after

@github-actions
Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!


From your project repository, check out a new branch and test the changes.

git checkout -b aymeviviana-remove-tech-express-8278 gh-pages
git pull https://github.com/aymeviviana/website.git remove-tech-express-8278

@github-actions github-actions bot added good first issue Good for newcomers role: front end Tasks for front end developers role: back end/devOps Tasks for back-end developers P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) time sensitive Needs to be worked on by a particular timeframe P-Feature: Projects page https://www.hackforla.org/projects/ size: 0.25pt Can be done in 0.5 to 1.5 hours labels Oct 13, 2025
Copy link
Member

@myronchen-git myronchen-git left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for working on this issue.


Done Correctly

  • The merge from and to branches have been correctly set.
  • The issue has been correctly linked.
  • The pull request title is named properly.
  • The whats and whys in the pull request description have been filled out.
  • The CodeQL alerts have been correctly checked off.
  • Screenshots accurately reflect before and after changes.
  • Code changes have been correctly made.
  • In the issue, you've correctly assigned yourself.
  • In the issue, the project and its status has been correctly assigned.

Changes that need to be made

  • In this pull request, please remove the note at the top, above "Fixes".

Optional recommendations

  • In the issue, you didn't give your availability and ETA. You can put that in now for completeness, but you should get into the habit of giving them after you've assigned yourself, even if you are able to complete the work in a few hours.

@github-project-automation github-project-automation bot moved this from PR Needs review to PRs being reviewed in P: HfLA Website: Project Board Oct 16, 2025
@aymeviviana
Copy link
Member Author

Availability: I'm available this week between 1pm to 5pm on Friday, Oct. 17.

@aymeviviana
Copy link
Member Author

@myronchen-git - Thank you for your review and notes. I have made the requested changes.

myronchen-git
myronchen-git previously approved these changes Oct 17, 2025
Copy link
Member

@myronchen-git myronchen-git left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for making the changes.

Your availability and ETA are supposed to be in the originating issue, not here in your pull request.

@rleeoriginal rleeoriginal self-requested a review October 19, 2025 19:58
@rleeoriginal
Copy link
Member

Review ETA: 10/21/25
Availability: 4-8 PM Tuesday (PST)

rleeoriginal
rleeoriginal previously approved these changes Oct 19, 2025
Copy link
Member

@rleeoriginal rleeoriginal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this issue, @aymeviviana !

Things Done Well

  • Pull request contains correct branch.
  • Linked issue is properly added.
  • Screenshots of changes are included.
  • Source code changes are applicable and clean.

Suggestions

None.

@github-project-automation github-project-automation bot moved this from PRs being reviewed to PRs ✅ waiting for merge team in P: HfLA Website: Project Board Oct 19, 2025
@ryanfkeller
Copy link
Member

Hi @aymeviviana, thank you for taking on this issue!

The changes you made look good, but there is a git house-keeping complication -- a different update also changed the Civic Tech Jobs technology section, and now git doesn't know how to automatically deal with adding your changes (removing Express) and their changes (adding Node.JS).

To resolve this, you'll want to "rebase" your changes on top of the lastest version of the gh-pages branch, handle the merge conflict manually (keep your removal of Express, keep the addition of Node.JS), then push the updates to your branch. I'd expect the flow to look something like this...

git checkout remove-tech-express-8278 # make sure you're on your issue branch
git fetch upstream                    # update your local git repo's understanding of what's on github

git rebase upstream/gh-pages         # perform the rebase so that your changes are effectively on the latest gh-pages

# ... you'll have to deal with the merge conflict manually, accepting the incoming change

# then once you're done...
git add _projects/civic-tech-jobs.md # add your conflict-fixed file
git rebase --continue # continue with the rebase after your successful fix 

# ... if you're doing all this in the command line, it might open a VI window for you to add a message. You can just exit. If you're doing it in the VSCode editor (recommended) it should be no problem. 

git push -f origin remove-tech-express-8278 # force push your update to your local fork (which updates this PR)
# force push is necessary because the history changed

If you're not that familiar with git, all of this can be a lot to deal with at first, but it gets easier and we are here to help! Please shoot me a Slack message if you need any help or have any questions. Thanks for taking a stab at this, git skills will take you far!

Here's a handy reference on what rebasing is and how to resolve merge conflicts, if you need it:
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase
https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts

@aymeviviana aymeviviana force-pushed the remove-tech-express-8278 branch from 1e7954f to 5e9e16e Compare October 23, 2025 17:42
@aymeviviana
Copy link
Member Author

Hi @ryanfkeller - Thank you so much for your very helpful, detailed instructions! I walked through the commands you provided, resolved the merge conflict and pushed my changes. Will this PR require two new approvals before it gets merged?

@ryanfkeller
Copy link
Member

@aymeviviana -- great work! Yes, sadly this reset the reviews and I'm not able to merge until we have 2 approvals... but I'll go ahead and approve myself and re-request from your other reviewers, and we'll get this closed out ASAP!

ryanfkeller
ryanfkeller previously approved these changes Oct 23, 2025
Copy link
Member

@ryanfkeller ryanfkeller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work making this change and dealing with the rebase! Approved!

Copy link
Member

@myronchen-git myronchen-git left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Ayme.

I do not see any changes to the repository that adds back inNode.js. There was a recent change that removed it. Looking at the current civic-tech-jobs.md, there is no line containing Node.js. Looking at the Files changed tab of your pull request, the right-hand side shows that you are adding something new that wasn't there before.

Please make a change to your commit and remove Node.js.

@github-project-automation github-project-automation bot moved this from PRs ✅ waiting for merge team to PRs being reviewed in P: HfLA Website: Project Board Oct 23, 2025
@ryanfkeller
Copy link
Member

Oof... apologies @aymeviviana, @myronchen-git is right! It looks like the merge conflict was from #8373, and was actually removing Node.JS, not adding it back in, and I made a mistake when looking through the git history.

Thanks @myronchen-git for the catch here! Yes, @aymeviviana, please do simply remove Node.JS and push up that change, no need to rebase here. Thanks!

@aymeviviana
Copy link
Member Author

Hi @ryanfkeller - for this change, which arguments do I need to pass to the git push command? Will I need to run git push -f origin remove-tech-express-8278 again? or something else?

@ryanfkeller
Copy link
Member

@aymeviviana -- good question, after you've made and committed the change, I'd go with git push origin remove-tech-express-8278.

git push from your branch would probably suffice, as for recent versions of git, that will default to pushing that branch to the upstream that it is tracking... but since git has tab-to-complete I normally don't mind being more explicit.

You don't need to include -f and generally will only want to include that flag when purposefully changing the git history (like when you rebased, it was necessary for that).

Copy link
Member

@myronchen-git myronchen-git left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All's good. 👍

@github-project-automation github-project-automation bot moved this from PRs being reviewed to PRs ✅ waiting for merge team in P: HfLA Website: Project Board Oct 23, 2025
@ryanfkeller ryanfkeller merged commit d9911c2 into hackforla:gh-pages Oct 24, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

good first issue Good for newcomers P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) P-Feature: Projects page https://www.hackforla.org/projects/ role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.25pt Can be done in 0.5 to 1.5 hours time sensitive Needs to be worked on by a particular timeframe

Projects

Development

Successfully merging this pull request may close these issues.

Update Project Profile: Civic Tech Jobs (Remove Tech: Express)

4 participants

Comments