Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #7 Added the mentors section #13

Merged
merged 1 commit into from
Oct 26, 2018
Merged

Fixed #7 Added the mentors section #13

merged 1 commit into from
Oct 26, 2018

Conversation

supunTE
Copy link
Member

@supunTE supunTE commented Oct 24, 2018

I used jekyll and added mentors section as this (issue[https://github.com//issues/7]).
So I jekyll build it for first time. So It shows lot of changes in this PR
Thanks!

@supunTE
Copy link
Member Author

supunTE commented Oct 24, 2018

https://stedirisuriya.github.io/gci18.fossasia.org/ Here is the preview link.

@supunTE supunTE changed the title Added the mentors section Fixed #7 Added the mentors section Oct 24, 2018
Copy link
Member

@mariobehling mariobehling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only change the mentors section. Don't change or add any unnecessary files. There are 586 files changed here!

@supunTE
Copy link
Member Author

supunTE commented Oct 24, 2018

I did changes

@mariobehling
Copy link
Member

A mentors section needs to contain - mentors. Simply adding placeholders does not make sense. We already have sample html in the repo.

@YashKumarVerma
Copy link
Member

@mariobehling sir,
maybe he wants to add a mentors section and not mentors to the page.
@STEdirisuriya only one sample data is enough for reference.

@supunTE
Copy link
Member Author

supunTE commented Oct 24, 2018

@mariobehling and @YashKumarVerma Thanks, I added six mentors from gci17 site Have a look now.

Copy link
Contributor

@fragm3 fragm3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work @STEdirisuriya

@abishekvashok
Copy link
Member

@STEdirisuriya just add one mentor, who is a mentor this year as well. We don't need past years mentor names here.

@fragm3
Copy link
Contributor

fragm3 commented Oct 24, 2018

Yes, rest looks good to me. @STEdirisuriya add Gemfile to gitignore

@isuruAb
Copy link
Member

isuruAb commented Oct 24, 2018

@mariobehling please review

@abishekvashok
Copy link
Member

@STEdirisuriya just add one mentor, who is a mentor this year as well. We don't need past years mentor names here.

@supunTE
Copy link
Member Author

supunTE commented Oct 24, 2018

@mariobehling please have a look again!

Copy link
Member

@NaviRocker NaviRocker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good to Me

@sarnava1
Copy link
Member

LGTM @mariobehling.

@supunTE supunTE closed this Oct 25, 2018
@supunTE supunTE reopened this Oct 25, 2018
@saarthakchats
Copy link
Member

#14
Don't we already have a mentors' section

Copy link
Member

@liveHarshit liveHarshit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase your branch with upstream by git pull --rebase upstream master then push it to your forked repo.

Gemfile Show resolved Hide resolved
@liveHarshit
Copy link
Member

Open the website, mentors section is already there. You can change UI or upgrade it by creating a new issue and send another PR.

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

Open the website, mentors section is already there. You can change UI or upgrade it by creating a new issue and send another PR.

I claimed the issue first and make the PR. Then how there is a another one? Another PR gets merged first. That was the reason. Kindly give me a solution.

@tabesin
Copy link
Member

tabesin commented Oct 26, 2018

@liveHarshit On the deployed https://gci18.fossasia.org/ I don't see a mentor section, maybe you mean the gci17 site?

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

@liveHarshit On the deployed https://gci18.fossasia.org/ I don't see a mentor section, maybe you mean the gci17 site?

@tabesin He is telling about an another PR. But there is a problem. I claimed the issue first and make the PR. You can see the issue here. #7

@tabesin
Copy link
Member

tabesin commented Oct 26, 2018

Guys, this is the comment section about this PR which is about the mentor section for the GCI18 site. The review of Mario has been resolved as far as I could see as only 10 files are changed.

I also don't see an existing mentor section at the deployed site and there seem to be no merge conflicts.

Other PR and other repositories are irrelevant here.

Copy link
Member

@liveHarshit liveHarshit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase it with upstream and change commit message to Update mentor section. Cannot be merged without rebasing because it is conflict with the base branch.

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

I reabse it already.

@liveHarshit
Copy link
Member

This branch has conflicts that must be resolved -
Conflicting files
index.html

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

This branch has conflicts that must be resolved -
Conflicting files
index.html

Resolved. Please review now @liveHarshit

@liveHarshit
Copy link
Member

Drop your 2 commits. Then rebase it after that again commit it with update mentor section message then push it. It is still showing conflicts.

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

@liveHarshit OK. resolved again

@liveHarshit
Copy link
Member

liveHarshit commented Oct 26, 2018

I told you to change commit message to Update the mentor section (#7)

@supunTE
Copy link
Member Author

supunTE commented Oct 26, 2018

I told you to change commit message to Update mentor section (#7)

@liveHarshit
OK. Did

@liveHarshit liveHarshit merged commit b2e5d95 into fossasia:master Oct 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet