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.

Sign up for GitHub

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

Jump to bottom

Changes removed before push #727

Merged
merged 8 commits into from
Mar 14, 2019
Merged

Changes removed before push #727

merged 8 commits into from
Mar 14, 2019

Conversation

ghost
Copy link

@ghost ghost commented Feb 25, 2019

Resolves #1

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Documentation update

How Has This Been Tested?

Screenshots

@armahillo armahillo requested a review from mdworken March 1, 2019 00:17
@armahillo
Copy link
Collaborator

When you're ready for this to be reviewed, let me, Michael, or Sean know. (It's still in Draft mode so I'm presuming you aren't finished yet)

@ghost ghost marked this pull request as ready for review March 13, 2019 02:14
@armahillo armahillo changed the title Draft Pull Request. Changes removed before push Changes removed before push Mar 13, 2019
@ghost ghost force-pushed the require-update-partner-status branch from 0841fef to 42a03e5 Compare March 13, 2019 03:24
@armahillo
Copy link
Collaborator

@seanmarcia Can you do the conflict resolve on this? It's related to your Sidekiq changes and I'm not sure what all needs to be changed. the Loyola fork hasn't taken on the upstream changes on this main repo, so it didn't have those changes yet.

@armahillo armahillo self-requested a review March 13, 2019 03:28
armahillo
armahillo approved these changes Mar 13, 2019
View reviewed changes
Copy link
Collaborator

@armahillo armahillo left a comment

Choose a reason for hiding this comment

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

Needs a conflict resolve with upstream changes, but otherwise is 👍

@seanmarcia seanmarcia changed the base branch from master to partner-status March 14, 2019 00:42
@seanmarcia seanmarcia merged commit b289edb into rubyforgood:partner-status Mar 14, 2019
@seanmarcia seanmarcia deleted the require-update-partner-status branch March 14, 2019 00:42
@armahillo armahillo added Loyola Issues tagged for contributors from Loyola University ❇️ Github First-timer This Pull Request is a user's first pull-request, EVER labels May 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdworken mdworken Awaiting requested review from mdworken

Assignees
No one assigned
Labels
❇️ Github First-timer This Pull Request is a user's first pull-request, EVER Loyola Issues tagged for contributors from Loyola University
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@armahillo @seanmarcia