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

[Ready for Code Review] Q&A 3.0.0 #103

Merged
merged 18 commits into from
Aug 13, 2015
Merged

[Ready for Code Review] Q&A 3.0.0 #103

merged 18 commits into from
Aug 13, 2015

Conversation

bricesanchez
Copy link
Member

  • Clean useless files
  • Update locale picker in forms
  • Fix tree reordering
  • Use config for backend route
  • Improve engine inclusion
  • Whitelist assets
  • Fix gallery selected option
  • Use new icons set
  • Fix gallery cancel link
  • Check tests
  • Add ability to update translated slug

Could you do a code review and merge it if it's good?

@bricesanchez bricesanchez changed the title [Working progress] Q&A 3.0.0 [Ready for Code Review] Q&A 3.0.0 Jul 10, 2015
class: "cancel confirm-delete",
data: {confirm: t('message', scope: 'refinery.admin.delete', title: gallery.title)}
}
%>
Copy link
Member

Choose a reason for hiding this comment

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

the indentation here seems dubious

@bricesanchez bricesanchez self-assigned this Jul 23, 2015
delete_url = refinery.portfolio_admin_item_path(item)
delete_options = {
class: "cancel confirm-delete",
data: {confirm: t('message', scope: 'refinery.admin.delete', title: item.title)}
Copy link
Member

Choose a reason for hiding this comment

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

strange indentation

@bricesanchez bricesanchez force-pushed the qa-3-0-0 branch 2 times, most recently from 6887cf3 to 8068997 Compare July 23, 2015 04:30
@bricesanchez
Copy link
Member Author

Is someone could review and merge this PR ?

@parndt
Copy link
Member

parndt commented Aug 9, 2015

@bricesanchez could you revert the indentation back to what it was?

i.e.:

protected

def some_method
end

private

def another_method
end

Instead of:

protected

  def some_method
  end

private

  def another_method
  end

@bricesanchez
Copy link
Member Author

It's ready @parndt :)

parndt added a commit that referenced this pull request Aug 13, 2015
[Ready for Code Review] Q&A 3.0.0
@parndt parndt merged commit 104039f into master Aug 13, 2015
@parndt parndt deleted the qa-3-0-0 branch August 13, 2015 02:02
@parndt
Copy link
Member

parndt commented Aug 13, 2015

Thanks!

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.

2 participants