Skip to content

Commit

Permalink
Merge pull request #115 from glogiotatidis/django1.4.21
Browse files Browse the repository at this point in the history
Push Django 1.4.21.
  • Loading branch information
glogiotatidis committed Jul 14, 2015
2 parents 47b92af + e94ee1f commit 36c2c88
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vendor-local/src/django
Submodule django updated 3813 files

7 comments on commit 36c2c88

@Osmose
Copy link
Contributor

@Osmose Osmose commented on 36c2c88 Jul 14, 2015

Choose a reason for hiding this comment

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

Is this okay? You downgraded from Django 1.5. I think it'd be better to just use this as an opportunity to upgrade Django to 1.7 or 1.8.

@glogiotatidis
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know that I downgraded, I tested locally and on stage before pushing this and looked ok. See also my comment in the commit glogiotatidis@e94ee1f

Do you have reasons to believe that this is not OK?

As far as upgrading to 1.8 I couldn't agree more but not possible in this timeframe.

@Osmose
Copy link
Contributor

@Osmose Osmose commented on 36c2c88 Jul 15, 2015

Choose a reason for hiding this comment

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

Do you have reasons to believe that this is not OK?

None that stood up to your sweet reassurances. 😍

@glogiotatidis
Copy link
Contributor Author

Choose a reason for hiding this comment

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

...and obviously there is a edge bug with non-latin chars, that I can't reproduce locally with ContentFile which produced broken bundles. I hot-patched it here b2a7fb4. Let me know if you have any objections.

I don't like hot-patching but as I mentioned above upgrading to 1.8 is the way to go but it's not very straight forward and given my limited time due to PTO and conferences in the next months I want to be able to security upgrade fast. I already took a TODO item for 1.8.

@glogiotatidis
Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh and btw thanks for always keeping an eye :)

@Osmose
Copy link
Contributor

@Osmose Osmose commented on 36c2c88 Jul 15, 2015

Choose a reason for hiding this comment

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

Patch looks fine to me, and it makes sense if you don't have the bandwidth. I started playing around with it myself but I have Pontoon stuff that's more important right now. :(

@glogiotatidis
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 thanks for checking!

Please sign in to comment.