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

Job improved import #443

Merged
merged 3 commits into from
Nov 17, 2017
Merged

Conversation

fedys
Copy link
Collaborator

@fedys fedys commented Nov 16, 2017

There were some conflicts in the ImportController class. Please go over it thoroughly. I am not sure I merged that correctly.

@cbleek cbleek requested a review from TiSiE November 16, 2017 14:41
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 38.022% when pulling b4fad96 on fedys:job-improved-import into e2b04c4 on cross-solution:develop.

Copy link
Member

@TiSiE TiSiE left a comment

Choose a reason for hiding this comment

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

There should've been one conflict around line 236, because ZF abandoned the fluent interface in the Event class.

Resolve looks good, though :)

@cross-bot cross-bot merged commit b4fad96 into cross-solution:develop Nov 17, 2017
cross-bot pushed a commit that referenced this pull request Nov 17, 2017
* pr-443:
  [Jobs] Improve categories importing
  [Jobs] Improve job importing
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.

None yet

4 participants