Skip to content
This repository has been archived by the owner on Sep 7, 2020. It is now read-only.

Fix content loader #326

Merged
merged 2 commits into from
Mar 19, 2016
Merged

Fix content loader #326

merged 2 commits into from
Mar 19, 2016

Conversation

thangngoc89
Copy link
Contributor

close #325

@codecov-io
Copy link

Current coverage is 67.57%

Merging #326 into next will increase coverage by +0.24% as of 6259c14

@@             next    #326   diff @@
=====================================
  Files          42      43     +1
  Stmts         548     552     +4
  Branches        0       0       
  Methods                         
=====================================
+ Hit           369     373     +4
  Partial         0       0       
  Missed        179     179       

Review entire Coverage Diff as of 6259c14

Powered by Codecov. Updated on successful CI builds.

const query =
this.options.statinamic
? this.options.statinamic.loader
: loaderUtils.parseQuery(this.query)
Copy link
Owner

Choose a reason for hiding this comment

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

I will add a merge instead, as well as test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK.

{
  ...this.options.statinamic.loader,
  ...loaderUtils.parseQuery(this.query)
}

right ?

I'll do it tmr.

Copy link
Owner

Choose a reason for hiding this comment

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

yeah that should be good :)

MoOx added a commit that referenced this pull request Mar 19, 2016
@MoOx MoOx merged commit bf94154 into next Mar 19, 2016
@MoOx MoOx deleted the fix/content-loader branch March 19, 2016 21:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants