use `do...end` for multi-line block
space out `protected` and remove trailing spaces
Fix Malformed PullReview conf file
Refactored image_fu helper to only use geometry when not nil.
Merge remote-tracking branch 'toch/fix-style-issues'

Conflicts:
	core/app/views/refinery/admin/_locale_picker.html.erb
Fixed incorrect assertion; saving a duplicate shouldn't increment count
Merge pull request #2810 from refinery/refactored-image-fu-to-prevent-bugs

Refactored image_fu helper to only use geometry when not nil.
bump sass-rails dependency to >=4.0, <5.1 for Foundation 5.5+ compatability
Merge pull request #2820 from paullaz/master

bump sass-rails dependency to >=4.0, <5.1 for Foundation 5.5+ compat
Removed unneeded assignment; added parentheses to method signature.
Fixed 'Ambiguous block operator' warning.
Prevented shadowing of outer local variable
Making the block parameter not as ambiguous.
removing unused local variable.
Merge pull request #2756 from refinery/refactorcop

Refactorcop refactors