Controller error handlers · Pull Request #268 · freeCodeCamp/freeCodeCamp

ghost · 2015-03-26T05:55:58Z

controllers/bonfire.js

ghost · 2015-03-26T23:39:37Z

Like that?

BerkeleyTrue · 2015-03-26T23:50:28Z

LGTM. Needs to be test. I don't think I will be able to until the weekend, though.

BerkeleyTrue · 2015-03-26T23:52:02Z

@jameskopacz Can you do me a favor? Do you know how to squash commits with git rebase -i ? I would like this to be one single commit. If you aren't comfortable do that we can pair on the weekend and I can walk you through it.

ghost · 2015-03-27T01:30:04Z

I rebased and squashed the changes in SourceTree. Does that look correct? If not would it be easier if I just submitted a new pull request with all the changes done at once?

BerkeleyTrue · 2015-03-27T01:36:28Z

No, you would end up with a single commit in this PR.

ghost · 2015-03-27T04:09:44Z

What about now, specifically: https://github.com/jameskopacz/freecodecamp/commit/1b1e1f5fc30c9f9f6fc5e4e8958f21a1c81d3053

In command line I did:
git rebase -i HEAD~7
picked first, squashed the rest, and deleted Error handlers (+6 squashed commit)
It rebased (8/8) which were the 8 individual commits.
Then I pushed that to github through SourceTree.

BerkeleyTrue · 2015-03-27T04:33:24Z

You should pushed (it will need to be a force push) it to the same branch that this PR comes from. And change the commit message so it is more succinct "handle callback errors for controller/user and ...". The end result will be this PR will be updated to show just one commit instead of multiple commits with the same message.

courseware, and resources controllers

BerkeleyTrue · 2015-03-27T04:41:25Z

To be more specific.

do: git rebase -i
now squash all the commits and rewrite the message. Here is a good post on proper commit messages.
Complete the rebase
No your local and remote branch of jameskopacz-patch-261 should differ.
*do git push -f to remote branch. This will wipe out the history and replace it with the local one so please use with caution.
github will recognize the change and update this PR automatically. Now it will show one commit with a succinct and imperative message. but the end changes to the files will be the same.

This practice of limiting PR's to one or a few commits is common in open source community and helps keep project history clean and searchable.

ghost · 2015-03-27T04:46:22Z

YEAAAAH! I think it worked!

BerkeleyTrue · 2015-03-27T04:48:32Z

👍 Isn't git awesome!

ghost · 2015-03-27T04:49:23Z

I wish it would of worked in SourceTree but using the command line did feel pretty cool, especially when it worked!

BerkeleyTrue · 2015-03-27T04:51:59Z

yeah ditch SoureTree. Do everything in command line. Using stuff like that ends up handicapping you. Git is meant for the command line. It's ok to use it for visual stuff, though I still do that in vim/command line.

ghost · 2015-03-27T04:53:13Z

What would be visual stuff?

BerkeleyTrue · 2015-03-27T04:57:21Z

diffs and visualizing all the different branches.

ghost · 2015-03-27T04:57:56Z

Ohh yeah, cool. That makes sense.

QuincyLarson · 2015-03-29T21:28:29Z

Hey @BerkeleyTrue can you QA this real quick and verify it's good for production?

BerkeleyTrue · 2015-03-31T20:47:18Z

@jameskopacz @QuincyLarson merged

Added introduction in the Front End Libraries Projects stub

…Camp#268)

# [3.2.0](freeCodeCamp/curriculum@v3.1.2...v3.2.0) (2018-09-20) ### Bug Fixes * **challenges:** a sentence didn't make sense, so I modified it ([3d77920](freeCodeCamp/curriculum@3d77920)), closes [freeCodeCamp#18046](https://github.com/freeCodeCamp/curriculum/issues/18046) * **challenges:** add missing test to check for for css class ([6e42f53](freeCodeCamp/curriculum@6e42f53)), closes [freeCodeCamp#254](freeCodeCamp/curriculum#254) * **challenges:** add note at bottom of description in d3 challenge ([c60d332](freeCodeCamp/curriculum@c60d332)), closes [freeCodeCamp#17767](https://github.com/freeCodeCamp/curriculum/issues/17767) * **challenges:** add solution, test to project euler problems ([f572324](freeCodeCamp/curriculum@f572324)) * **challenges:** add solutions to first 3 debugging challenges ([c2e5794](freeCodeCamp/curriculum@c2e5794)) * **challenges:** add test to check user is using \W in Regex ([296cf44](freeCodeCamp/curriculum@296cf44)) * **challenges:** add test to lookahead regex challenge ([e044de4](freeCodeCamp/curriculum@e044de4)), closes [freeCodeCamp#209](freeCodeCamp/curriculum#209) * **challenges:** added code tags ([065036b](freeCodeCamp/curriculum@065036b)), closes [freeCodeCamp#18054](https://github.com/freeCodeCamp/curriculum/issues/18054) * **challenges:** added solutions to project euler problems 28, 31 ([5e12499](freeCodeCamp/curriculum@5e12499)) * **challenges:** adding code tags to description ([57d5b55](freeCodeCamp/curriculum@57d5b55)), closes [freeCodeCamp#17911](https://github.com/freeCodeCamp/curriculum/issues/17911) * **challenges:** adding negative integer to challenge to improve tests ([freeCodeCamp#211](freeCodeCamp/curriculum#211)) ([2adc516](freeCodeCamp/curriculum@2adc516)) * **challenges:** allow user to comment out undesired code ([72c2407](freeCodeCamp/curriculum@72c2407)) * **challenges:** challenge description is formatted and concised ([dcd8e45](freeCodeCamp/curriculum@dcd8e45)) * **challenges:** change challengeType to fix help button ([ddcc661](freeCodeCamp/curriculum@ddcc661)) * **challenges:** change definition of complementary colors ([freeCodeCamp#299](freeCodeCamp/curriculum#299)) ([c022dff](freeCodeCamp/curriculum@c022dff)) * **challenges:** check for shorthand character in regex ([freeCodeCamp#238](freeCodeCamp/curriculum#238)) ([0bf8d32](freeCodeCamp/curriculum@0bf8d32)) * **challenges:** commented output was wrong ([3cb972e](freeCodeCamp/curriculum@3cb972e)) * **challenges:** converts delete html test to regex ([d80d98d](freeCodeCamp/curriculum@d80d98d)), closes [freeCodeCamp#251](freeCodeCamp/curriculum#251) * **challenges:** corrected challenge instructions ([159203a](freeCodeCamp/curriculum@159203a)) * **challenges:** fix [freeCodeCamp#17155](https://github.com/freeCodeCamp/curriculum/issues/17155) ([cb21e59](freeCodeCamp/curriculum@cb21e59)) * **challenges:** fix confusing destructuring es6 challenge ([1a4f6a8](freeCodeCamp/curriculum@1a4f6a8)), closes [freeCodeCamp#213](freeCodeCamp/curriculum#213) * **challenges:** fix description in css variable fallback challenge ([bc33a03](freeCodeCamp/curriculum@bc33a03)), closes [freeCodeCamp#17546](freeCodeCamp#17546) * **challenges:** fix flex direction row regex ([25ea07e](freeCodeCamp/curriculum@25ea07e)), closes [freeCodeCamp#260](freeCodeCamp/curriculum#260) * **challenges:** fix grammar and spelling errors ([freeCodeCamp#244](freeCodeCamp/curriculum#244)) ([b0c0b74](freeCodeCamp/curriculum@b0c0b74)) * **challenges:** fix grid-gap shorthand regex ([freeCodeCamp#232](freeCodeCamp/curriculum#232)) ([a49f45e](freeCodeCamp/curriculum@a49f45e)), closes [freeCodeCamp#229](freeCodeCamp/curriculum#229) * **challenges:** fix grid-gap shorthand regex ([freeCodeCamp#237](freeCodeCamp/curriculum#237)) ([b369fa0](freeCodeCamp/curriculum@b369fa0)), closes [freeCodeCamp#229](freeCodeCamp/curriculum#229) * **challenges:** fix regex in a JS challenge ([freeCodeCamp#257](freeCodeCamp/curriculum#257)) ([6058da3](freeCodeCamp/curriculum@6058da3)) * **challenges:** fix typo in wrap-reverse description ([434ea5c](freeCodeCamp/curriculum@434ea5c)) * **challenges:** fixed challenge accepted without any new code ([96b39c1](freeCodeCamp/curriculum@96b39c1)), closes [freeCodeCamp#198](freeCodeCamp/curriculum#198) * **challenges:** fixed esc chars in managing packages with npm lesson ([6335a15](freeCodeCamp/curriculum@6335a15)) * **challenges:** fixed tests to check for pre operators ([ded4705](freeCodeCamp/curriculum@ded4705)), closes [freeCodeCamp#199](freeCodeCamp/curriculum#199) * **challenges:** fixed typo in algorithms and ds ([31957a4](freeCodeCamp/curriculum@31957a4)) * **challenges:** Incorrect html closing tag ([a1464f0](freeCodeCamp/curriculum@a1464f0)) * **challenges:** insufficient objectives for javascript_algorithm/es6/19 ([7707b18](freeCodeCamp/curriculum@7707b18)) * **challenges:** missing space in code example ([c50cc4e](freeCodeCamp/curriculum@c50cc4e)) * **challenges:** remove race condition from react lifecycle challenge ([a20ac56](freeCodeCamp/curriculum@a20ac56)) * **challenges:** removed duplicate css top property ([0a79c58](freeCodeCamp/curriculum@0a79c58)) * **challenges:** rephrased wording in applied visual design ([freeCodeCamp#268](freeCodeCamp/curriculum#268)) ([d560d58](freeCodeCamp/curriculum@d560d58)) * **challenges:** replaced em tags with code tags ([68daaf7](freeCodeCamp/curriculum@68daaf7)), closes [freeCodeCamp#18048](https://github.com/freeCodeCamp/curriculum/issues/18048) * **challenges:** reword test text and improve test accuracy ([f834a98](freeCodeCamp/curriculum@f834a98)) * **challenges:** small edit to correct sematic issues ([322bf80](freeCodeCamp/curriculum@322bf80)) * clickjacking challenge description ([037990c](freeCodeCamp/curriculum@037990c)) * **challenges:** spelling and grammar errors addressed ([8f17adf](freeCodeCamp/curriculum@8f17adf)) * **challenges:** typo ([4f7faba](freeCodeCamp/curriculum@4f7faba)) * **challenges:** update test and add solution for DS challenge ([d1b2075](freeCodeCamp/curriculum@d1b2075)), closes [freeCodeCamp#164](freeCodeCamp/curriculum#164) * **challenges:** Update test to include whitespace ([freeCodeCamp#272](freeCodeCamp/curriculum#272)) ([77689f4](freeCodeCamp/curriculum@77689f4)), closes [freeCodeCamp#271](freeCodeCamp/curriculum#271) * **schema:** change schema and unpack script ([b014b23](freeCodeCamp/curriculum@b014b23)) ### Features * **challenges:** add browser fallback challenge ([b090e8b](freeCodeCamp/curriculum@b090e8b)), closes [freeCodeCamp#17546](freeCodeCamp#17546)

ghost mentioned this pull request Mar 26, 2015

Error handlers needed #261

Closed

5 tasks

BerkeleyTrue reviewed Mar 26, 2015
View reviewed changes

controllers/bonfire.js Outdated

This comment was marked as off-topic.

Sign in to view

terakilobyte added the in progress label Mar 26, 2015

Handle callback errors for user, bonfire, challenges,

c17ff59

courseware, and resources controllers

BerkeleyTrue merged commit c17ff59 into freeCodeCamp:master Mar 31, 2015

raisedadead pushed a commit that referenced this pull request Sep 27, 2018

Put Content in Front End Libraries Projects stub (#268)

586753e

Added introduction in the Front End Libraries Projects stub

ValeraS pushed a commit to ValeraS/freeCodeCamp that referenced this pull request Oct 12, 2018

fix(challenges): rephrased wording in applied visual design (freeCode…

d560d58

…Camp#268)

snyk-bot mentioned this pull request Apr 27, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 yuhonghong66/freeCodeCamp#88

Open

SC0T1ISHNiNjA mentioned this pull request Apr 28, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 SC0T1ISHNiNjA/freeCodeCamp#87

Open

ojongerius mentioned this pull request Apr 28, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 ojongerius/freeCodeCamp#62

Open

kaocher82 mentioned this pull request Apr 28, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 Xtuden-com/freeCodeCamp#46

Open

snyk-bot mentioned this pull request Apr 28, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 ajesse11x/freeCodeCamp#80

Open

thangnguyen2001 mentioned this pull request Apr 28, 2022

[Snyk] Security upgrade loopback-boot from 2.27.1 to 3.1.0 thangnguyen2001/freeCodeCamp#104

Open

yuhonghong66 mentioned this pull request Oct 9, 2024

[Snyk] Fix for 1 vulnerabilities yuhonghong66/freeCodeCamp#167

Open

SC0T1ISHNiNjA mentioned this pull request Oct 11, 2024

[Snyk] Fix for 1 vulnerabilities SC0T1ISHNiNjA/freeCodeCamp#158

Open

ajesse11x mentioned this pull request Oct 12, 2024

[Snyk] Fix for 1 vulnerabilities ajesse11x/freeCodeCamp#151

Open

kaocher82 mentioned this pull request Oct 12, 2024

[Snyk] Fix for 1 vulnerabilities Xtuden-com/freeCodeCamp#121

Open

Uh oh!

Conversation

ghost commented Mar 26, 2015

Uh oh!

This comment was marked as off-topic.

Uh oh!

ghost commented Mar 26, 2015

Uh oh!

BerkeleyTrue commented Mar 26, 2015

Uh oh!

BerkeleyTrue commented Mar 26, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

BerkeleyTrue commented Mar 27, 2015

Uh oh!

ghost commented Mar 27, 2015

Uh oh!

QuincyLarson commented Mar 29, 2015

Uh oh!

BerkeleyTrue commented Mar 31, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants