Skip to content

Instantly share code, notes, and snippets.

@marti1125
Last active December 17, 2015 16:19
Show Gist options
  • Save marti1125/5637712 to your computer and use it in GitHub Desktop.
Save marti1125/5637712 to your computer and use it in GitHub Desktop.
intruccion para el pull request de mozillians
https://github.com/mozilla/mozillians/blob/master/docs/contribute.rst
hi
10:38 fxa90id hi marti1125
10:38 marti1125 hi giorgos
10:41 giorgos hi marti1125
10:42 marti1125 hi... for bug 797790 https://bug797790.bugzilla.mozilla.org/attachment.cgi?id=751581
10:42 firebot Bug https://bugzilla.mozilla.org/show_bug.cgi?id=797790 nor, --, ---, willy, ASSI, Create Your Profile page error message is ambiguous
10:44 giorgos marti1125, you have a pull request waiting?
10:44 marti1125 no yet..
10:45 giorgos ok, so how can I help you?
10:45 marti1125 is correct .. to put together input text with message...
10:47 giorgos marti1125, do you want to remove the error message next to the input?
10:48 marti1125 yes.. =?
10:51 giorgos marti1125, ok the helper "bootstrap()" creates the markup for the field and adds the error
10:52 giorgos e.g. line 52 of register.html is -> {{ bootstrap(profile_form.full_name) }}
10:52 marti1125 so i need this {{ bootstrap(full_name) }}
10:53 giorgos bootstrap is in apps/common/helpers.py and uses the template under templates/bootstraap/field_default.html
10:53 giorgos no the last file is the interesting one for you.
10:53 giorgos *but*
10:53 marti1125 field_default.html this
10:53 giorgos i'm not sure that you should alter this field yet
10:54 giorgos so before you do that
10:54 giorgos since 'country' is also required now (bug 859548)
10:54 firebot Bug https://bugzilla.mozilla.org/show_bug.cgi?id=859548 nor, --, ---, michaljev, RESO FIXED, [Profile] Require country field
10:54 giorgos make sure that you rebase your branch and add 'country' as well
10:55 giorgos and when pull request your changes, with the error message appearing in two places and we'll discuss it again
10:55 giorgos sounds good, marti1125 ?
10:55 marti1125 ok, no problem
10:56 giorgos marti1125, ok if you need help rebasing or anything ping me
10:56 *** cmore joined #commtools
10:56 marti1125 for pull request i need a create a new branch
10:56 fxa90id
10:56 fxa90id marti1125, I am king of rebasing
10:56 giorgos marti1125, it's better to create a new branch for every bug that you work on
10:57 giorgos fxa90id, indeed!
10:57 fxa90id oh
10:57 fxa90id 3 pull request for today
10:57 marti1125 XD
10:58 fxa90id where is my mentor sancus ?
10:58 marti1125 i dont have a mentor xD
10:58 marti1125 i dont know.... =?
10:58 fxa90id marti1125,
10:58 fxa90id you have
10:58 marti1125 who =?
10:58 fxa90id [mentor=giorgos][lang=python][ux][good first bug]
10:58 fxa90id marti1125, giorgos is your mentor
10:58 marti1125 ups sry
10:58 fxa90id each bug have own mentor
10:59 marti1125
10:59 sancus fxa90id: lol, what?
10:59 fxa90id sancus, if youre not busy https://bugzilla.mozilla.org/show_bug.cgi?id=809252
10:59 firebot Bug 809252 enh, --, ---, michaljev, ASSI, From address on mail send outs is missing a proper name
10:59 *** mbrandt quit (Ping timeout)
10:59 fxa90id marti1125, https://github.com/mozilla/mozillians/blob/master/docs/contribute.rst
11:00 marti1125 so i will create a new branch because my change is in the master.. i forget it
11:01 fxa90id hmm
11:01 fxa90id you should make branch before you made any commits in your master
11:01 *** mbrandt|mtg joined #commtools
11:01 sancus fxa90id: looks mostly good but I would change the name of that setting to something like 'FROM_NOREPLY' because 'EMAIL_ADDRESS' is extremely vague and tells you nothing about what it contains
11:01 fxa90id 1. dont make any commits in master
11:01 fxa90id sancus, oky doky
11:05 fxa90id marti1125, ok
11:06 marti1125 me too, i didnt commit yet..
11:06 marti1125 commited..
11:06 fxa90id
11:06 fxa90id great then
11:06 fxa90id I had always problem with that
11:06 *** garethc quit (Quit: Leaving.)
11:07 fxa90id was commiting in master and then I was sending stupid pull requests with not mine changes
11:07 fxa90id
11:08 *** garethc joined #commtools
11:09 marti1125 so when i create a branch with the name of the bug..
11:09 fxa90id yes
11:09 marti1125 git branch 666 XD
11:10 fxa90id like git checkout -b Bug_797790
11:11 marti1125 for this bug751581
11:11 firebot Bug https://bugzilla.mozilla.org/show_bug.cgi?id=751581 enh, --, ---, nobody, NEW, Add a thumbnail of the user's profile pic to the navbar
11:11 fxa90id what ever you like to call it
11:11 marti1125 and then...
11:12 fxa90id then code ;p
11:12 fxa90id and then make commits
11:12 fxa90id run ./manage.py test if you made any python changes
11:12 marti1125 git branch my_branch this branch is empty =?
11:12 fxa90id yes
11:12 fxa90id but i prefer running
11:12 fxa90id git checkout -b my_branch
11:12 fxa90id
11:14 marti1125 what do this command?
11:14 fxa90id make new branch and switch you there
11:14 fxa90id makes ;d
11:14 fxa90id whatever
11:17 marti1125 ok thanks
11:20 marti1125 so i will send the pull request at night or tomorrow..
11:21 fxa90id marti1125, take your time
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment