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

Bring rustup.js and markup into alingment with rust-www #1437

Merged
merged 1 commit into from
Jul 7, 2018

Conversation

brson
Copy link
Contributor

@brson brson commented Jun 17, 2018

This makes rustup.js the same as on rust-www, pulls in
some of the language from rust-www, pulls in some fixes
to platform detection, fixes some css.

This makes rustup.js the same as on rust-www, pulls in
some of the language from rust-www, pulls in some fixes
to platform detection, fixes some css.
@brson
Copy link
Contributor Author

brson commented Jun 17, 2018

This needs to be reviewed and merged with rust-lang/prev.rust-lang.org#1128.

@Diggsey
Copy link
Contributor

Diggsey commented Jun 17, 2018

LGTM, but maybe we should just remove rustup.js from one of these repos and have it link to rustup.js from the other?

@brson
Copy link
Contributor Author

brson commented Jun 18, 2018

@Diggsey seems ok to me, except for risk of possible unanticipated drift between the two.

@brson
Copy link
Contributor Author

brson commented Jul 1, 2018

I'm not inclined to work on this further, but doing the change @Diggsey suggested sounds fine.

@Diggsey
Copy link
Contributor

Diggsey commented Jul 1, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2018

📌 Commit c7fe58c has been approved by Diggsey

@bors
Copy link
Contributor

bors commented Jul 1, 2018

⌛ Testing commit c7fe58c with merge bef9496...

bors added a commit that referenced this pull request Jul 1, 2018
Bring rustup.js and markup into alingment with rust-www

This makes rustup.js the same as on rust-www, pulls in
some of the language from rust-www, pulls in some fixes
to platform detection, fixes some css.
@bors
Copy link
Contributor

bors commented Jul 1, 2018

💔 Test failed - status-travis

@Diggsey Diggsey merged commit 2ef9b30 into rust-lang:master Jul 7, 2018
AJ-Ianozi pushed a commit to AJ-Ianozi/getada-download that referenced this pull request Mar 9, 2024
Bring rustup.js and markup into alingment with rust-www
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.

3 participants