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

Sj epic queue changes #737

Merged
merged 4 commits into from Nov 21, 2016
Merged

Sj epic queue changes #737

merged 4 commits into from Nov 21, 2016

Conversation

Stuart-Johnson
Copy link
Collaborator

No description provided.

@kayla-glick
Copy link
Contributor

@Stuart-Johnson Can you fix the merge conflicts on this branch?

class AddOriginToEpicQueueRecord < ActiveRecord::Migration
def change
add_column :epic_queue_records, :origin, :string
add_column :epic_queue_records, :identity_id, :integer
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Meh, as far as I can tell, the actual end result is identical in this instance, but I'll change it just for consistency.

@@ -0,0 +1,5 @@
class AddIdentityIdToEpicQueue < ActiveRecord::Migration
def change
add_column :epic_queues, :identity_id, :integer
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

See above.

@jleonardw9 jleonardw9 merged commit 4ea8516 into master Nov 21, 2016
@jleonardw9 jleonardw9 deleted the sj-epic_queue_changes branch November 21, 2016 15:08
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.

None yet

6 participants