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

Added new requirements to the existing ones for updating the travel fund for community members #492

Merged
merged 24 commits into from Apr 2, 2020

Conversation

@designMoreWeb
Copy link
Contributor

designMoreWeb commented Mar 14, 2020

This pull request is for fixing the issue 249 which is for updating the travel fund for community members. This has been reviewed by @joesepi and i have spoken with him.

Copy link
Member

mcollina left a comment

lgtm

@designMoreWeb

This comment has been minimized.

Copy link
Contributor Author

designMoreWeb commented Mar 16, 2020

I just added and updated the file

@christian-bromann

This comment has been minimized.

Copy link
Member

christian-bromann commented Mar 17, 2020

@designMoreWeb it looks to me there are still some duplicates in there, like:

  • An active member of a project community is someone who has had recent, sustained contributions
    to the project for the past 90 days. [?]

and

  • Any member of a project community, who has had recent, sustained contributions to the project for the past 90 days or more is eligible. [?]

as well as

  • Employees of Foundation Member companies are eligible, but we encourage the use of internal funds that may be available to them first. [?]

and

  • Those requesting funds must indicate that they do not have funding available from another
    source, such as an employer or the event itself that might cover costs for presenters. source, such as an employer or the event itself that might cover costs for presenters. [?]
@designMoreWeb

This comment has been minimized.

Copy link
Contributor Author

designMoreWeb commented Mar 17, 2020

  • An active member of a project community is someone who has had recent, sustained contributions
    to the project for the past 90 days. [[?]](https://github.com/openjs-foundation/cross-project-
    council/pull/492/files#diff-253e2bba25da1e96be2ca31802ee066eR15-R16)

That is there as a sub bullet letting people know what an active member or being active for the project means

@christian-bromann

This comment has been minimized.

Copy link
Member

christian-bromann commented Mar 17, 2020

@designMoreWeb I see but then I assume we don't need the addition anymore because we have defined already that active members are eligible for funding.

@designMoreWeb

This comment has been minimized.

Copy link
Contributor Author

designMoreWeb commented Mar 17, 2020

@christian-bromann I hear your point but i have kept it and will bring it up at the cross council meeting this week. I would want to get it checked with the board before removing any information that they might have seen as an addition/clarification

Copy link
Member

christian-bromann left a comment

👍

Copy link
Member

mhdawson left a comment

LGTM

Copy link
Member

mcollina left a comment

It seems a lot of - have been replaced with * where it was not needed.

project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
@eemeli
eemeli approved these changes Mar 24, 2020
Copy link
Member

eemeli left a comment

The regexp s/-/*/g replacement was a bit too greedy. Also, nitpicky commments. Otherwise looks good.

project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
designMoreWeb and others added 3 commits Mar 24, 2020
Co-Authored-By: Eemeli Aro <eemeli@gmail.com>
Co-Authored-By: Eemeli Aro <eemeli@gmail.com>
Co-Authored-By: Eemeli Aro <eemeli@gmail.com>
fixes# especially if it merges an updated upstream into a topic branch.
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
Co-Authored-By: Jordan Harband <ljharb@gmail.com>
designMoreWeb and others added 5 commits Mar 24, 2020
Co-Authored-By: Jordan Harband <ljharb@gmail.com>
Co-Authored-By: Jordan Harband <ljharb@gmail.com>
Copy link
Contributor Author

designMoreWeb left a comment

Shows as fixed on my end

Copy link
Contributor Author

designMoreWeb left a comment

made required changes

…unding available from another

source, such as an employer or the event itself that might cover costs for presenters* as it was a duplication of the other points
@designMoreWeb designMoreWeb requested a review from mcollina Mar 24, 2020
Copy link
Member

ljharb left a comment

You may want to stop doing any automated find/replaces, and make all the changes manually?

project-resources/MEMBER_TRAVEL_FUND.md Outdated Show resolved Hide resolved
@designMoreWeb

This comment has been minimized.

Copy link
Contributor Author

designMoreWeb commented Mar 25, 2020

You may want to stop doing any automated find/replaces, and make all the changes manually?

Hey I appreciate all the help and feedback but i am actually manually parsing through the file and making the changes. I think it's also that my linter is kicking in which i have removed for the time being so i can get this fixed. I did not anticipate this PR to get so complex, i am working on fixing things on my end. I appreciate all the feedback and comments from @christian-bromann @MylesBorins @ljharb @mcollina @eemeli @mhdawson @dmethvin. I am working on the fix and thanks for your guidance and patience

Copy link
Member

mhdawson left a comment

LGTM

Copy link
Member

mcollina left a comment

lgtm

@joesepi joesepi merged commit a660dc8 into openjs-foundation:master Apr 2, 2020
1 check passed
1 check passed
doc-lint
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.