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

Zjs/issue 43 #54

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Zjs/issue 43 #54

wants to merge 5 commits into from

Conversation

stayman
Copy link
Contributor

@stayman stayman commented Jun 10, 2016

Renamed bonus_credits to reserves everywhere except in the api calls

@FifthSurprise
Copy link
Contributor

Huh? I don't think api calls refer to bonus credits...but if they do, we should rename them.

@stayman stayman force-pushed the zjs/issue-43 branch 2 times, most recently from 507737b to 4575636 Compare June 13, 2016 01:47
create_table "team_roles", force: :cascade do |t|
t.string "role_name"
t.string "role_display_name"
t.string "role_color"
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like your rebase added a schema value that it should not have.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll deal with this

@FifthSurprise
Copy link
Contributor

Tagged as Issue #43

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants