PR#65: Remove some words as GSoC is already open for GSoC applicants. - mentored-projects

mentored-projects

#65 Remove some words as GSoC is already open for GSoC applicants.

Merged 5 years ago by jflory7. Opened 5 years ago by n0vad3v.

n0vad3v/mentored-projects master into master

Fix Merge Conflicts.

n0vad3v • 5 years ago

36ec0a1

Merge branch 'master' of ssh://pagure.io/forks/n0vad3v/mentored-projects

n0vad3v • 5 years ago

569e5d9

Remove some words as GSoC is already open for GSoC applicants.

n0vad3v • 5 years ago

e9e4aea

modules/ROOT/pages/gsoc/2019/application.adoc

file modified

+1 -1

		`@@ -17,7 +17,7 @@`
		`== Important`

		`* Timelines are set by Google for the entire program. Follow the timeline.`
		`- * Applications are due in Google's system by March 27, 2019 18:00`
		`+ * Applications are due in Google's system by April 9th, 2019 18:00`
		`(CEST).`
		`* Applications Must be filed in the Google system. No other`
		`material can be read or accepted.`

modules/ROOT/pages/gsoc/2019/ideas.adoc

file modified

+15 -41

		`@@ -4,14 +4,14 @@`
		`WARNING: Fedora is still applying to be a GSoC mentoring organization. This page will be updated if we are accepted. We are currently collecting possible project ideas here.`
		`////`

		`- NOTE: Fedora is proud to have been accepted as a GSoC mentoring organization. Student applications open on March 25, 2019. Please make sure you carefully read through the link:index.html[general information] and xref:application.adoc[application process] pages before applying.`
		`+ NOTE: Fedora is proud to have been accepted as a GSoC mentoring organization. Student applications open on March 25, 2019. Please make sure you carefully read through the xref:gsoc/2019/index.adoc[general information] and xref:gsoc/2019/application.adoc[application process] pages before applying.`

		`If you are a student looking forward to participating in`
		`- link:index.html[Google Summer of Code with Fedora], please feel free to`
		`+ xref:gsoc/2019/index.adoc[Google Summer of Code with Fedora], please feel free to`
		`browse this idea list. There may be additional ideas added during the`
		`application period.`

		`- **Now please go read the link:index.html#what-can-i-do-today[What`
		`+ **Now please go read the xref:gsoc/2019/index.adoc#what-can-i-do-today[What`
		`Can I do Today] section of the main page. This has the answers to your`
		`questions and tells you how to apply**`

		`@@ -36,14 +36,13 @@`

		`== Idea list`
		`NOTE: Ideas are subject to change as additional mentors are onboarded.`
		`-`
		`- * <<CentOS CI user front end>>`
		`+`
		`+ * <<CentOS CI user front end>>`
		`* <<Improving Fedora Android App>>`
		`* <<Fedora Gooey Karma>>`
		`* <<Change management tool>>`
		`* <<Podman Container SECCOMP generation tool>>`
		`* <<Release-bot>>`
		`- * <<Fedora Happiness Packets>>`
		`* <<Container image updates in bodhi are pushed immediately>>`

		`=== CentOS CI user front end`
		`@@ -59,9 +58,9 @@`

		`The CentOS Project runs a public CI resource that is available to all infra and infra related open source projects to come and consume. The problem is that the signup process is very manual, both for the incoming user and the CICO admins. CentOS CI is powered by OKD (https://okd.io), and we would like to have a web application that handles the login, Admin approval, and OKD project creation (from a template) steps and also displays links to active CICO namespaces.`

		`- Read more :`
		`+ Read more :`

		`- - https://wiki.centos.org/QaWiki/CI`
		`+ - https://wiki.centos.org/QaWiki/CI`
		`- https://wiki.centos.org/QaWiki/CI/GettingStarted`

		`==== Deliverables`
		`@@ -87,7 +86,7 @@`

		`Repo: https://pagure.io/Fedora-app`

		`- Goals :`
		`+ Goals :`

		`- Make the app available on other platforms`
		`- Implement new integrations based on community interest`
		`@@ -117,7 +116,7 @@`
		`==== Deliverables`
		`As a GSoC intern, you will be responsible for the following :`

		`- - Look for Community Feedback and work on features`
		`+ - Look for Community Feedback and work on features`
		`- Application ported to Bodhi2 API and Python3`
		`- Revamp the UI built with QT`
		`- Package and ship`
		`@@ -134,7 +133,7 @@`

		`==== Description`

		`- Fedora's Change process currently involves a lot of manual work to move proposals through the process. Information is copy/pasted into a variety of platforms, which is tedious and error-prone.`
		`+ Fedora's Change process currently involves a lot of manual work to move proposals through the process. Information is copy/pasted into a variety of platforms, which is tedious and error-prone.`

		`What are we looking for:`

		`@@ -163,7 +162,7 @@`
		`- Technology : Golang, Containers, Podman, Linux`
		`- Mentor : Dan Walsh, Valentin Rothberg`

		`- ==== Contact`
		`+ ==== Contact`
		`- Dan Walsh [IRC: dwalsh, mail: dwalsh@redhat.com, twitter: rhatdan, github: rhatdan],`
		`- Valentin Rothberg [IRC: vrothberg, mail: rothberg@redhat.com, twitter: vlntnrthbrg, github: vrothberg]`

		`@@ -183,7 +182,7 @@`
		`- Collaborate with the mentors and the community to integrate the functionality upstream`

		`'''`
		`- === Release-bot`
		`+ === Release-bot`

		`- Difficulty : Intermediate`
		`- Technology : Python`
		`@@ -208,39 +207,14 @@`


		`'''`
		`-`
		`- === Fedora Happiness Packets`
		`+ === Container image updates in bodhi are pushed immediately`

		`- Difficulty : Intermediate`
		`- - Technology : Python and Django, HTML/CSS/JS, UI UX skills graphic design`
		`- - Mentor : Jona Azizaj [jonatoni@fedoraproject.org]`
		`- - IRC : jonatoni`

		`-`
		`- ==== Description`
		`-`
		`- Fedora Happiness Packets is a web application to send positive feedback and thank-you notes to Fedora contributors. You can send a note with your name or anonymously. The Fedora community used it during the Fedora Appreciation Week in 2018, where contributors thanked each other and celebrated our accomplishments together. Fedora wants to extend Happiness Packets by giving a Fedora Badge to anyone who sends a Happiness Packet to another contributor.`
		`- Repo : https://pagure.io/fedora-commops/fedora-happiness-packets/issues`
		`-`
		`- ==== Deliverables`
		`- As a GSoC intern, you will be responsible for the following :`
		`-`
		`- - Create Fedora Badge rule file to automatically award badge`
		`- - Add support for video messages and emojis`
		`- - Improve the current website and make it responsive`
		`- - Improve documentation`
		`- - Etc`
		`-`
		`- '''`
		`-`
		`- === Container image updates in bodhi are pushed immediately`
		`-`
		`- - Difficulty : Intermediate`
		`-`
		`- Technology : Python, Linux containers, skopeo, podman, pyramid`
		`-`
		`+`
		`- Mentor : Tomas Tomecek [ttomecek@fedoraproject.org]`
		`-`
		`+`
		`==== Description`
		`We are using bodhi to release container images to registry.fedoraproject.org. Since images are just a delivery method of software, we would love to release to registry right away. With the current solution, it may take day(s) for an image to land in the registry.`
		`This project requires changes in bodhi.`

modules/ROOT/pages/gsoc/2019/index.adoc

file modified

+5 -9

		`@@ -7,8 +7,6 @@`

		`NOTE: Fedora is proud to have been accepted as a GSoC mentoring organization. Student applications open on March 25, 2019.`

		`- IMPORTANT: Student applications are not open yet!`
		`-`
		`image::gsoc_logo.png[float="right"]`

		`This page contains information about Fedora's participation in Google`
		`@@ -25,8 +23,8 @@`
		`Fedora is proud to have been accepted as a GSoC mentoring organization.`
		`Student applications open on March 25, 2019.`

		`- Today you should read through the xref:ideas.adoc[ideas] and think about`
		`- our xref:application.adoc[application process.]`
		`+ Today you should read through the xref:gsoc/2019/ideas.adoc[ideas] and think about`
		`+ our xref:gsoc/2019/application.adoc[application process.]`

		`[[student-information]]`
		`== Student Information`
		`@@ -35,17 +33,15 @@`
		`distributions? GSoC could be your chance. Please refer to the information`
		`below.`

		`- NOTE: Student applications are not yet open.`
		`-`
		`* If you're interested in working on a mentor-submitted idea, read`
		`- the xref:ideas.adoc[ideas page] and about the project and the related`
		`+ the xref:gsoc/2019/ideas.adoc[ideas page] and about the project and the related`
		`technology. There is no need to contact the mentor unless you have a`
		`specific question about the project. Don't send an "I'm interested" email.`

		`* If you're interested in proposing your own project start looking`
		`around the Fedora Project for a mentor and send your idea to the mailing`
		`list or post it on the wiki. A list of potential mentors is also on the`
		`- xref:ideas.adoc[ideas page].`
		`+ xref:gsoc/2019/ideas.adoc[ideas page].`

		`* You may also wish to start working on the Fedora specific parts of`
		`the application, see below for more information. Carefully review the`
		`@@ -126,7 +122,7 @@`
		`=== Student Application`

		`Please read and follow the`
		`- xref:application.adoc[student application process].`
		`+ xref:gsoc/2019/application.adoc[student application process].`

		`[[mentor-information]]`
		`== Mentor Information`

n0vad3v commented 5 years ago

Besides this patch, I found something weird that previously the xref in application.adoc won't work before my patch, these xrefs in that(such as xref:ideas.adoc[ideas page] seems working.

Previously found problems:https://pagure.io/mentored-projects/pull-request/60

Metadata Update from @jflory7:
- Pull-request tagged with: GSoC
- Request assigned

5 years ago

jflory7 commented 5 years ago

Hi @n0vad3v, thanks for sending the pull request. Your change looks good to me, but there is a git merge conflict. Could you resolve the merge conflict so we can merge the PR?

BTW, if you're not sure how to do this, let me know. I have a few resources I can point you towards if you're still not super comfortable with git.