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

Fixes #2296 - send patch for lost commits #2297

Merged
merged 1 commit into from
Mar 27, 2018
Merged

Conversation

zoepage
Copy link
Member

@zoepage zoepage commented Mar 27, 2018

r? @miketaylr

not 100% sure, I got everything. But should cover the bigger chunks.

Copy link
Member

@miketaylr miketaylr left a comment

Choose a reason for hiding this comment

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

I'm gonna double check one or two things (and add them here) before merging. THanks!

@@ -253,19 +253,20 @@ issues.ImageUploadView = Backbone.View.extend({
return;
}

var inlineHelp = $("<span></span>", {
// what is wc-Form-helpInline???

This comment was marked as abuse.


// this can probably go as we do not have wc- styles anymore?

This comment was marked as abuse.

This comment was marked as abuse.

@@ -69,7 +69,7 @@ <h1 class="headline-1">Report Site Issue</h1>
</div>
<div class="form-text form-element js-Form-group">
{{ form.os(class_='form-field text-field') }}
<span class="form-input-validation check js-bug-form-os"></span>
<span class="form-input-validation check"></span>

This comment was marked as abuse.

This comment was marked as abuse.

@@ -85,7 +85,7 @@ <h1 class="headline-1">Report Site Issue</h1>
{{ subradio.label(class_='form-label label-radio') }}
{% endfor %}
</div>
<div class="form-upload js-image-upload js-Form-group loader js-image-loader">
<div class="form-upload js-image-upload js-Form-group">

This comment was marked as abuse.

This comment was marked as abuse.

@zoepage
Copy link
Member Author

zoepage commented Mar 27, 2018

🎉 thanks! LMK, if you have questions!

@miketaylr
Copy link
Member

miketaylr commented Mar 27, 2018

OK, i removed those form.html bits, and we should be good to merge once Travis is green.

@miketaylr miketaylr changed the title Issue #2296 - send patch for lost commits Fixes #2296 - send patch for lost commits Mar 27, 2018
@miketaylr miketaylr merged commit 2589a4e into refactor Mar 27, 2018
@miketaylr miketaylr deleted the merge-fix-patch branch March 27, 2018 15:51
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