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

Change default for jQuery CDN to false #5105

Merged
merged 1 commit into from Aug 24, 2014
Merged

Conversation

@goobertron
Copy link

goobertron commented Aug 5, 2014

This changes the default setting for using jQuery.com's CDN from true to false. This is in response to the vote in this Loomio proposal.

Note: I think this shouldn't be merged until the next major release is being prepared, so that podmins are more alert to the possibility of defaults being changed. So please set a flag for next-major, and I'll have to rebase when the time comes.

Hope that's OK.

@jaywink jaywink added this to the next-major milestone Aug 6, 2014
@jhass jhass merged commit 93a2b36 into diaspora:develop Aug 24, 2014
1 check failed
1 check failed
continuous-integration/travis-ci The Travis CI build could not complete due to an error
Details
jhass added a commit that referenced this pull request Aug 24, 2014
Change default for jQuery CDN to false
@jhass
Copy link
Member

jhass commented Aug 24, 2014

Thank you!

@goobertron goobertron deleted the goobertron:jquery_default branch Aug 24, 2014
@goobertron
Copy link
Author

goobertron commented Aug 26, 2014

Hi @jhass, I wasn't expecting this to be merged until the next major release. Because of that I hadn't yet added a changelog entry.

We'll need to make a prominent note in the changelog for podmins that, unless they have uncommented the jquery setting in diaspora.yml, the setting will change with this release.

Now that this has been merged, what is the best way to do that? Separate PR just with a changelog entry?

@jhass
Copy link
Member

jhass commented Aug 26, 2014

Sure, just do that :)

@goobertron
Copy link
Author

goobertron commented Aug 26, 2014

OK, looking at the changelog, this PR has an entry under head. Does that mean that this won't be included in 0.4.1.0 even though it has already been merged? Apologies if that is exactly what the next-major milestone does - I thought it was just a visual reminder to the admins of what should be finished before each release was made.

I'll still add a note to the changelog, but it depends whether I place it under Head or 0.4.1.0.

@Flaburgan
Copy link
Member

Flaburgan commented Aug 26, 2014

As it is a major change, it will not be included in 0.4.1.0 which is a minor release. So you placed it correctly.

@goobertron
Copy link
Author

goobertron commented Aug 26, 2014

Well that's what I thought, but it has been merged into develop before the next minor release, so I want to check what is going to happen.

@svbergerem
Copy link
Member

svbergerem commented Aug 26, 2014

@goobertron There is a seperate branch for the 0.4.1.0 release (https://github.com/diaspora/diaspora/tree/release/0.4.1.0) because @jhass merged the rails 4 branch into develop which won't be part of the next release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.