Procházet zdrojové kódy

Move dev/ docs to development/ (#10453)

tags/v1.40.0rc1
Eric Eastwood před 2 roky
committed by GitHub
rodič
revize
d518b05a86
V databázi nebyl nalezen žádný známý klíč pro tento podpis ID GPG klíče: 4AEE18F83AFDEB23
9 změnil soubory, kde provedl 8 přidání a 7 odebrání
  1. +1
    -1
      CONTRIBUTING.md
  2. +1
    -0
      changelog.d/10453.doc
  3. +3
    -3
      docs/SUMMARY.md
  4. +0
    -0
      docs/development/cas.md
  5. +3
    -3
      docs/development/git.md
  6. +0
    -0
      docs/development/img/git/branches.jpg
  7. +0
    -0
      docs/development/img/git/clean.png
  8. +0
    -0
      docs/development/img/git/squash.png
  9. +0
    -0
      docs/development/saml.md

+ 1
- 1
CONTRIBUTING.md Zobrazit soubor

@@ -392,7 +392,7 @@ By now, you know the drill!
# Notes for maintainers on merging PRs etc

There are some notes for those with commit access to the project on how we
manage git [here](docs/dev/git.md).
manage git [here](docs/development/git.md).

# Conclusion



+ 1
- 0
changelog.d/10453.doc Zobrazit soubor

@@ -0,0 +1 @@
Consolidate development documentation to `docs/development/`.

+ 3
- 3
docs/SUMMARY.md Zobrazit soubor

@@ -67,7 +67,7 @@
# Development
- [Contributing Guide](development/contributing_guide.md)
- [Code Style](code_style.md)
- [Git Usage](dev/git.md)
- [Git Usage](development/git.md)
- [Testing]()
- [OpenTracing](opentracing.md)
- [Database Schemas](development/database_schema.md)
@@ -77,8 +77,8 @@
- [TCP Replication](tcp_replication.md)
- [Internal Documentation](development/internal_documentation/README.md)
- [Single Sign-On]()
- [SAML](dev/saml.md)
- [CAS](dev/cas.md)
- [SAML](development/saml.md)
- [CAS](development/cas.md)
- [State Resolution]()
- [The Auth Chain Difference Algorithm](auth_chain_difference_algorithm.md)
- [Media Repository](media_repository.md)


docs/dev/cas.md → docs/development/cas.md Zobrazit soubor


docs/dev/git.md → docs/development/git.md Zobrazit soubor

@@ -9,7 +9,7 @@ commits each of which contains a single change building on what came
before. Here, by way of an arbitrary example, is the top of `git log --graph
b2dba0607`:

<img src="git/clean.png" alt="clean git graph" width="500px">
<img src="img/git/clean.png" alt="clean git graph" width="500px">

Note how the commit comment explains clearly what is changing and why. Also
note the *absence* of merge commits, as well as the absence of commits called
@@ -61,7 +61,7 @@ Ok, so that's what we'd like to achieve. How do we achieve it?
The TL;DR is: when you come to merge a pull request, you *probably* want to
“squash and merge”:

![squash and merge](git/squash.png).
![squash and merge](img/git/squash.png).

(This applies whether you are merging your own PR, or that of another
contributor.)
@@ -105,7 +105,7 @@ complicated. Here's how we do it.

Let's start with a picture:

![branching model](git/branches.jpg)
![branching model](img/git/branches.jpg)

It looks complicated, but it's really not. There's one basic rule: *anyone* is
free to merge from *any* more-stable branch to *any* less-stable branch at

docs/dev/git/branches.jpg → docs/development/img/git/branches.jpg Zobrazit soubor


docs/dev/git/clean.png → docs/development/img/git/clean.png Zobrazit soubor


docs/dev/git/squash.png → docs/development/img/git/squash.png Zobrazit soubor


docs/dev/saml.md → docs/development/saml.md Zobrazit soubor


Načítá se…
Zrušit
Uložit