egret/team-docs
1
0
Fork 1
forked from docs/team-docs
Code Pull requests Wiki Activity

Updated 7-steps GitLab guide for casual contributions (#15)

Browse source
This commit is contained in:
Anthony McGlone 2023-01-23 12:03:37 +00:00
commit ea5e3c2c53
4 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
modules/ROOT/assets/images/webuibeta-2a.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 153 KiB

BIN
modules/ROOT/assets/images/webuibeta-6a.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 186 KiB

2
modules/ROOT/nav.adoc
View file

@ -18,7 +18,7 @@
** xref:contributing-docs/contrib-new-documentation.adoc[Contributing a new documentation site]
** Contribution Tools
*** xref:contributing-docs/tools-7step-gitlab-howto.adoc[HowTo for casual contributions (for GitLab-based pages)]
*** xref:contributing-docs/tools-gitlab-howto.adoc[HowTo for casual contributions (for GitLab-based pages)]
// ** xref:contributing-docs/7step-pagure-howto.adoc[7 Step HowTo for casual contributions (for Pagure-based pages)]
*** HowTo for casual contributions (for Pagure-based pages)
//** xref:contributing-docs/use-web-ide-ui.adoc[How to profoundly use the Gitlab web IDE (permanent members)]

27
modules/ROOT/pages/contributing-docs/tools-7step-gitlab-howto.adoc → modules/ROOT/pages/contributing-docs/tools-gitlab-howto.adoc
View file

@ -1,6 +1,6 @@
= Fedora Docs "HowTo" for casual contributions
Fedora Documentation Team <https://discussion.fedoraproject.org/tag/docs>
v0.0.1, 2022-09-26
v0.0.2, 2023-01-23
== Create and propose a change in a Docs page
@ -30,6 +30,10 @@ NOTE: If you have already a GitLab account and if you want to link it to your FA
a|image::2-GitLabSignin.png[align="center",width=940,role=black-border]
|===
NOTE: The following steps demonstrate the editing process for a **first-time contributor**. If you have merge privileges for a repository (or you have already forked it), you
will see the "Edit file" page, which you can edit. Afterward, click "Commit changes" and proceed to create a <<merge-request,merge request>>.
Click the button "Open in Web IDE":
|===
@ -48,16 +52,10 @@ Then make the necessary changes to the page in the Web IDE and ...
a|image::webuibeta-1.png[align="center",width=940,role=black-border]
|===
\... once you've finished, click on both the branch icon and the file to view your changes:
\... once you've finished, click on both the branch icon and the file to view your changes. Enter a commit message and click "Commit & Push":
|===
a|image::webuibeta-2.png[align="center",width=940,role=black-border]
|===
Enter a commit message (e.g. Updated grammar) and click "Commit & Push":
|===
a|image::webuibeta-3.png[align="center",width=940,role=black-border]
a|image::webuibeta-2a.png[align="center",width=940,role=black-border]
|===
Click on "Yes Commit to a new branch":
@ -72,16 +70,10 @@ Enter a branch name and press Enter:
a|image::webuibeta-5.png[align="center",width=940,role=black-border]
|===
Click on "GitLab" in the bottom right-hand corner. This will bring up a dialog with several options:
Click on "GitLab" in the bottom left-hand corner. This will bring up a dialog with the "Go to GitLab" option. Click on it:
|===
a|image::webuibeta-6.png[align="center",width=940,role=black-border]
|===
Select "Go to GitLab" from those options:
|===
a|image::webuibeta-7.png[align="center",width=940,role=black-border]
a|image::webuibeta-6a.png[align="center",width=940,role=black-border]
|===
Click "Create merge request" on the banner that appears:
@ -90,6 +82,7 @@ Click "Create merge request" on the banner that appears:
a|image::webuibeta-8.png[align="center",width=940,role=black-border]
|===
[[merge-request]]
This will display a merge request window. You should edit the Title and the Description of the page (feel free to copy-paste the Commit Message) and then, scroll down to the blue "Create merge request" button and click it:
|===