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

fixing the promotion categories error message #1346

Merged
merged 1 commit into from
May 3, 2018

Conversation

mgharbik
Copy link
Contributor

No description provided.

@mamhoff
Copy link
Contributor

mamhoff commented Aug 4, 2016

Would you mind squashing the two commits into one and adding a meaningful commit message explaining this change? You'll have to rebase onto the current master anyways, and it'd be really nice if this not-so-obvious change would be somewhat more well-documented.

Otherwise, this looks good. I'm especially happy you added specs for the fixed behaviour. Thank you!

@mgharbik mgharbik force-pushed the small-fix-promotion-categories branch 2 times, most recently from 597eed8 to c911e53 Compare August 16, 2016 12:57
@mgharbik
Copy link
Contributor Author

@mamhoff I just sent you another PR. Thank you too for the tips!

@mgharbik mgharbik force-pushed the small-fix-promotion-categories branch from c911e53 to 4886b12 Compare August 16, 2016 13:16
@tvdeyen
Copy link
Member

tvdeyen commented Oct 4, 2017

Could you please rebase on current master? Thanks

@tvdeyen tvdeyen added needs work changelog:solidus_backend Changes to the solidus_backend gem labels Oct 4, 2017
Copy link

@houndci-bot houndci-bot left a comment

Choose a reason for hiding this comment

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

Some files could not be reviewed due to errors:

.rubocop.yml: Style/FileName has the wrong namespace - should be Naming
.rubocop.yml: Style/FileName has the wrong namespace - should be Naming
.rubocop.yml: Style/PredicateName has the wrong namespace - should be Naming
.rubocop.yml: Style/AccessorMethodName has the wrong namespace - should be Naming
.rubocop.yml: Style/ElseAlignment has the wrong namespace - should be Layout
.rubocop.yml: Style/IndentationWidth has the wrong namespace - should be Layout
.rubocop.yml: Style/AlignParameters has the wrong namespace - should be Layout
.rubocop.yml: Style/ClosingParenthesisIndentation has the wrong namespace - should be Layout
.rubocop.yml: Style/MultilineMethodCallIndentation has the wrong namespace - should be Layout
.rubocop.yml: Style/IndentArray has the wrong namespace - should be Layout
.rubocop.yml: Style/IndentHash has the wrong namespace - should be Layout
.rubocop.yml: Style/AlignHash has the wrong namespace - should be Layout
.rubocop.yml: Style/DotPosition has the wrong namespace - should be Layout
.rubocop.yml: Style/SpaceBeforeBlockBraces has the wrong namespace - should be Layout
.rubocop.yml: Style/SpaceInsideParens has the wrong namespace - should be Layout
Error: The `Style/OpMethod` cop has been renamed and moved to `Naming/BinaryOperatorParameterName`.
(obsolete configuration found in .rubocop.yml, please update it)

…1346

- fixing the error messages display for promotion categories
- displaying no resources found if no promotion categories
- adding features specs for promotion categories
@mgharbik mgharbik force-pushed the small-fix-promotion-categories branch from dd6c361 to 9f444f0 Compare February 8, 2018 08:15
@mgharbik
Copy link
Contributor Author

mgharbik commented Feb 8, 2018

@tvdeyen sorry for the late replay! Please check it now!

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thanks

Copy link
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

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

Thanks!

@tvdeyen tvdeyen merged commit 41ec808 into solidusio:master May 3, 2018
@tvdeyen
Copy link
Member

tvdeyen commented May 3, 2018

Sorry that this took so long

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:solidus_backend Changes to the solidus_backend gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants