Merged
Conversation
It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter.
Collaborator
|
Failed to set assignee to
|
rustbot
added
the
S-waiting-on-review
Member
Author
|
r? @Kobzol |
Member
|
This was added back in rust-lang/rustc-dev-guide#1297, I don't believe there's actually any javascript minification build step here, so it's probably just checked in intentionally? In any case, this is fine. r? jieyouxu @bors r+ rollup |
Collaborator
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jan 21, 2025
Ignore `mermaid.min.js` It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter. r? rustc-dev-guide
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jan 21, 2025
Ignore `mermaid.min.js` It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter. r? rustc-dev-guide
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 21, 2025
Rollup of 10 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135625 ([cfg_match] Document the use of expressions.) - rust-lang#135638 (Make it possible to build GCC on CI) - rust-lang#135648 (support wasm inline assembly in `naked_asm!`) - rust-lang#135707 (Shorten linker output even more when `--verbose` is not present) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135779 (CI: free disk on linux arm runner) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135814 (ci: use ghcr buildkit image) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 21, 2025
Ignore `mermaid.min.js` It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter. r? rustc-dev-guide
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 21, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135625 ([cfg_match] Document the use of expressions.) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors) - rust-lang#135821 (fix OsString::from_encoded_bytes_unchecked description) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 21, 2025
Ignore `mermaid.min.js` It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter. r? rustc-dev-guide
This was referenced Jan 21, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 22, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135706 (Move `supertrait_def_ids` into the elaborate module like all other fns) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135821 (fix OsString::from_encoded_bytes_unchecked description) - rust-lang#135824 (tests: delete `cat-and-grep-sanity-check`) - rust-lang#135833 (Add fixme and test for issue rust-lang#135289) Failed merges: - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 22, 2025
Rollup merge of rust-lang#135793 - jyn514:gitignore, r=jieyouxu Ignore `mermaid.min.js` It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep. Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use `.gitignore` as a default filter. r? rustc-dev-guide
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It is very long and tends to match a lot of search queries. It's not useful to show with ripgrep.
Note that this does not actually untrack the file; changes can still be committed (although I suspect it may not have been intentional to commit originally?). This just changes how it interacts with tools that use
.gitignoreas a default filter.r? rustc-dev-guide