diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-10-16 08:40:12 +0200 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-10-16 12:51:13 +0000 |
| commit | 1fbc6315c0fa845c6d12b761eb456bb1b6b6f8e5 (patch) | |
| tree | dde0421019bc28d9c8f5ab86593164fa04084da1 /docbook | |
| parent | cf83a67fd3caf670f5b314df6c2941b2c0d75d6c (diff) | |
docs: remove references to gerrit.
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_quick_setup.adoc | 4 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.adoc | 28 |
2 files changed, 9 insertions, 23 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc index 7a046c9b84..776a4ea598 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc @@ -275,7 +275,7 @@ Using the command line: ---- >cd C:\Development ->git clone https://code.wireshark.org/review/wireshark +>git clone https://gitlab.com/wireshark/wireshark.git ---- Using Git extensions: @@ -287,7 +287,7 @@ Using Git extensions: . In the main screen select _Clone repository_. Fill in the following: + -Repository to clone: *`https://code.wireshark.org/review/wireshark`* +Repository to clone: *`https://gitlab.com/wireshark/wireshark.git`* + Destination: Your top-level development directory, e.g. _C:\Development_. + diff --git a/docbook/wsdg_src/WSDG_chapter_sources.adoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc index 5293044fca..ef3c6a241a 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.adoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc @@ -653,37 +653,23 @@ See {wireshark-wiki-url}FuzzTesting for details. When you're satisfied with your changes (and obtained any necessary approval from your organization) you can upload them for review at -{wireshark-code-review-url}. This requires a Gerrit Code Review account +{wireshark-code-review-url}. This requires a Gitlab account as described at <<ChSrcGitRepository>>. -Changes should be pushed to a -https://code.wireshark.org/review/Documentation/user-upload.html#push_create[magical "refs/for" branch] -in Gerrit. For example, to upload your new Snowcone Machine Protocol dissector -you could push to refs/for/master with the topic "snowcone-machine": +You need to fork your repository which will became yours, and you will have write access to it. Once +you are done with your changes, push them to a branch of your choice (as snowcone-machine). Now in the +Gitlab's UI a message will tell you that you created a new branch and a button to create a merge request. + [source,sh] ---- -$ git push ssh://my.username@code.wireshark.org:29418/wireshark HEAD:refs/for/master/snowcone-machine +$ git push https://gitlab.com/wireshark/<my.username>.git HEAD:<branchname> ---- The username `my.username` is the one which was given during registration with the review system. -If you have `git-review` installed you can upload the change with a lot less typing: - -[source,sh] ----- -# Note: The "-f" flag deletes your current branch. -git review -f ----- - -You can push using any Git client. Many clients have support for Gerrit, either -built in or via an additional module. - -The Change-Id is very relevant in the review process, since it's the key used -to identify one change. See the -https://gerrit-review.googlesource.com/Documentation/user-changeid.html[Gerrit manual] -for more details. +You can push using any Git client. You might get one of the following responses to your patch request: |