Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activity stream #1732

Merged
merged 4 commits into from
Jul 13, 2018
Merged

Activity stream #1732

merged 4 commits into from
Jul 13, 2018

Conversation

darkdarkdragon
Copy link
Contributor

WIP to review
fixes #925

'new_bounty': 'fa-money-bill-alt',
'work_done': 'fa-check-circle',
}
def add_view_props(activity):

Choose a reason for hiding this comment

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

E306 expected 1 blank line before a nested definition, found 0

@codecov
Copy link

codecov bot commented Jul 12, 2018

Codecov Report

Merging #1732 into master will decrease coverage by 0.04%.
The diff coverage is 15.62%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1732      +/-   ##
==========================================
- Coverage   29.08%   29.04%   -0.05%     
==========================================
  Files         134      134              
  Lines       10101    10133      +32     
  Branches     1328     1338      +10     
==========================================
+ Hits         2938     2943       +5     
- Misses       7058     7085      +27     
  Partials      105      105
Impacted Files Coverage Δ
app/app/urls.py 89.74% <ø> (ø) ⬆️
app/retail/views.py 33.33% <12%> (-3.45%) ⬇️
app/dashboard/tokens.py 63.63% <20%> (-36.37%) ⬇️
app/dashboard/models.py 56.11% <50%> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 74f4f8f...6ba811f. Read the comment docs.

@ghost ghost assigned owocki Jul 13, 2018
@ghost ghost added the in progress label Jul 13, 2018
}


def add_view_props(activity):

Choose a reason for hiding this comment

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

E303 too many blank lines (2)

Copy link
Contributor

@owocki owocki left a comment

Choose a reason for hiding this comment

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

LGTM after 6ba811f

app/app/urls.py Outdated
@@ -170,6 +170,8 @@
url(r'^mission/?', retail.views.mission, name='mission'),
re_path(r'^results/?(?P<keyword>.*)/?', retail.views.results, name='results_by_keyword'),
re_path(r'^results/?', retail.views.results, name='results'),
url(r'^activity/?', retail.views.activity, name='activity'),
url(r'^mission/?', retail.views.mission, name='mission'),
Copy link
Contributor

Choose a reason for hiding this comment

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

mission is in here twice now

@owocki owocki merged commit 523e3f1 into gitcoinco:master Jul 13, 2018
@ghost ghost removed the in progress label Jul 13, 2018


def token_by_name(name):
for token in tokens:
Copy link
Contributor

Choose a reason for hiding this comment

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

tokens is undefined in this scope.

Copy link
Contributor

Choose a reason for hiding this comment

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

yea i fixed this in master and now we good https://gitcoin.co/activity

Copy link
Contributor

Choose a reason for hiding this comment

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

I pushed a fix as soon as it popped on rollbar the other day? 🤔 2325aa7

Copy link
Contributor

Choose a reason for hiding this comment

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

thx; i think i must have fixed another 500 issue on /activity then

@darkdarkdragon darkdarkdragon deleted the activity_stream branch July 17, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

code - gitcoin.co/activity
4 participants