Quests improvements #5433
Quests improvements #5433
Conversation
straumer
requested review from
danlipert,
octavioamu and
thelostone-mc
as code owners
Codecov Report
@@ Coverage Diff @@
## master #5433 +/- ##
==========================================
+ Coverage 29.63% 29.66% +0.02%
==========================================
Files 242 242
Lines 20660 20660
Branches 2991 2991
==========================================
+ Hits 6123 6129 +6
+ Misses 14285 14279 -6
Partials 252 252
Continue to review full report at Codecov.
|
requirements/test.txt
Outdated
| pytest-cov==2.6.0 | ||
| pytest-isort==0.2.1 | ||
| pytest-django==3.4.4 | ||
| pytest==5.2.2 |
There was a problem hiding this comment.
@danlipert ok with bumping these versions?
There was a problem hiding this comment.
definitely not - needs to be removed from this PR @straumer
There was a problem hiding this comment.
I removed the commit, rebased on master, resolved a small conflict, tested again manually and did a forced push on the branch. It doesn't seem to be updating the PR though, should I make a new PR? @owocki
|
code LGTM if the versiuon bumps are ok with @danlipert |
|
Ok. If not okay, I can remove that commit. It's just for the tests to run properly on my end. |
|
it def needs to be updated on the PR
…On Tue, Nov 5, 2019 at 11:23 AM Matthías Ragnarsson < ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In requirements/test.txt
<#5433 (comment)>:
> @@ -1,8 +1,8 @@
-r base.txt
-pytest==4.0.1
-pytest-cov==2.6.0
-pytest-isort==0.2.1
-pytest-django==3.4.4
+pytest==5.2.2
I removed the commit, rebased on master, resolved a small conflict, tested
again manually and did a forced push on the branch. It doesn't seem to be
updating the PR though, should I make a new PR? @owocki
<https://github.com/owocki>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#5433?email_source=notifications&email_token=AAD5PCMJ7OK3BNWSBHK6SMTQSG227A5CNFSM4JHBOT72YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKL6HLI#discussion_r342722208>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAD5PCOFT4PB3KJ3XTQP7JLQSG227ANCNFSM4JHBOT7Q>
.
_________________________________________
check out what i'm building on github <http://github.com/owocki>
or what i'm shooting on photoshelter <http://photography.owocki.com/>
or find me on twitter <http://www.twitter.com/owocki>, facebook
<http://www.facebook.com/kevinowocki>, instagram
<http://instagram.com/owocki>, linkedin <http://www.linkedin.com/in/owocki>,
and owocki.com <http://www.owocki.com/?utm_source=emailsig>.
see you around teh internets!
PS -- Come to the next Boulder Blockchain
<https://www.meetup.com/Boulder-Blockchain/> meetup. Be there or be ^ 2.
PPS -- Have I mentioned that *G**itcoin is live?* More @ https://gitcoin.co
|
|
@owocki Github is supposed to update it according to the branch, so I can't do much about that. The branch is already updated. |
|
maybe you pushed to the wrong branch or remote |
|
No. Looking at the branch, it says 5 commits (this PR has 6 commits) and there are changes made very recently. Those changes aren't reflected in the PR for some reason. |
|
I also resolved the conflict showing on this PR (app/quests/views.py) already on that branch. |
|
@owocki Oh wow. Now it has updated, but takes into account all the commits I rebased on from master. That's messed up. |
straumer
force-pushed
the
quests-improvements
branch
from
29eb386 to
02544fa
Compare
|
@owocki Okay there we go. Tip to self to rebase directly on upstream/master and not pull onto origin/master first and rebase on that for github to register. |
Description
This PR fulfills issue #5379. The changes are the following on the page where a new quest is created.
Clean new answers when added:
Before:
After:
Clean new questions when added:
Before:
After:
Limit on the number of answers for each question:
Refers/Fixes
#5379 - Main issue this addresses
It also builds upon these PRs: #5393 and #5409
Testing
No tests. I just changed javascript.