Skip to content

Commit 730cdc6

Browse files
authored
ARC-164 Renaming Github to Atlassian (#523)
* first commit of github renaming/rebranding to atlassian * forgot connect.ts * changing github url to github-for-jira * few more github url to github-for-jira
1 parent 81ca348 commit 730cdc6

17 files changed

+79
-391
lines changed

CODE_OF_CONDUCT.md

Lines changed: 18 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,26 @@
1-
# Contributor Covenant Code of Conduct
1+
# Open source code of conduct
22

3-
## Our Pledge
3+
This code of conduct outlines our expectations for participants within the **Atlassian** community, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. Anyone who violates this code of conduct may be banned from the community.
44

5-
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of experience,
9-
education, socio-economic status, nationality, personal appearance, race,
10-
religion, or sexual identity and orientation.
5+
Our open source community strives to:
116

12-
## Our Standards
7+
* **Be friendly and patient.**
8+
* **Be welcoming:** We strive to be a community that welcomes and supports people of all backgrounds and identities.
9+
* **Be considerate:** Your work will be used by other people, and you in turn will depend on the work of others. Decisions you make affect everyone in the community, so please be mindful of your actions and always choose a non-confrontational approach. Remember: this is a global community and English is not everyone's primary language.
10+
* **Be respectful:** Disagreements may occur, but we cannot abide personal attacks. The health of the community depends on all members feeling comfortable and supported. If you don't agree, use discretion and be polite.
11+
* **Be careful in the words that we choose:** we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable.
12+
* **Try to understand why we disagree:** Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn't mean that they're wrong. Don't forget that it is human to err and blaming each other doesn't get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
1313

14-
Examples of behavior that contributes to creating a positive environment
15-
include:
14+
In addition, our open source communities are expected to abide by the [Atlassian Acceptable Use Policy](https://www.atlassian.com/legal/acceptable-use-policy).
1615

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
16+
## Reporting Issues
17+
If you experience or witness unacceptable behavior or have any other concerns please report it by contacting us via [[email protected]](mailto:[email protected]). All reports will be handled with discretion. In your report please include:
2218

23-
Examples of unacceptable behavior by participants include:
19+
* Your contact information.
20+
* Names (real, nicknames, or pseudonyms) of any individuals involved. If there are additional witnesses, please include them as well. Your account of what occurred, and if you believe the incident is ongoing. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger), please include a link.
21+
* Any additional information that may be helpful.
2422

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
23+
After filing a report, a representative will contact you personally, review the incident, follow up with any additional questions, and make a decision as to how to respond. If the person who is harassing you is part of the response team, they will recuse themselves from handling your incident. If the complaint originates from a member of the response team, it will be handled by a different member of the response team. We will respect confidentiality requests for the purpose of protecting victims of abuse.
3324

34-
## Our Responsibilities
35-
36-
Project maintainers are responsible for clarifying the standards of acceptable
37-
behavior and are expected to take appropriate and fair corrective action in
38-
response to any instances of unacceptable behavior.
39-
40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
45-
46-
## Scope
47-
48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
53-
further defined and clarified by project maintainers.
54-
55-
## Enforcement
56-
57-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at [email protected]. All
59-
complaints will be reviewed and investigated and will result in a response that
60-
is deemed necessary and appropriate to the circumstances. The project team is
61-
obligated to maintain confidentiality with regard to the reporter of an incident.
62-
Further details of specific enforcement policies may be posted separately.
63-
64-
Project maintainers who do not follow or enforce the Code of Conduct in good
65-
faith may face temporary or permanent repercussions as determined by other
66-
members of the project's leadership.
67-
68-
## Attribution
69-
70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72-
73-
[homepage]: https://www.contributor-covenant.org
25+
## Attribution & Acknowledgements
26+
This code of conduct is based on the [Open Code of Conduct v1.0](https://github.com/todogroup/opencodeofconduct) from the [TODOGroup](http://todogroup.org/). We are thankful for their work and all the communities who have paved the way with code of conducts.

CONTRIBUTING.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,27 @@
22

33
Hi there! We're thrilled that you'd like to contribute to this project. Your ideas are essential for keeping making it better :)
44

5-
## Notices
6-
Contributions to this product are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
5+
## Contributor License Agreement
76

8-
Please note that this project releases with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
7+
Atlassian must have a [Contributor License Agreement (CLA)](https://opensource.atlassian.com/cla) on file from each individual or corporation contributing to our open-source projects. The CLA allows contributors to maintain ownership in the IP of their contributions while granting Atlassian the rights to control and maintain our projects.
8+
9+
Submit an [individual CLA](https://opensource.atlassian.com/individual) or a [corporate CLA](https://opensource.atlassian.com/corporate).
10+
11+
## License & Code of Conduct
12+
13+
Contributions to this project releases to the public under [our open source license](LICENSE).
14+
15+
Please note that this project has a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
916

1017
## Getting Started
1118

1219
This app is written in [Typescript](https://www.typescriptlang.org/) and runs on [Node.js](https://nodejs.org/) **v14.x**.
1320

14-
Please install [Docker](https://www.docker.com/get-started) and [Docker Compose](https://docs.docker.com/compose/install/) for the external dependencies like the Postgres database and Redis.
21+
Please install [Docker](https://www.docker.com/get-started) and [Docker Compose](https://docs.docker.com/compose/install/) to easily run the project locally.
1522

1623
### Installing a tunneling tool
1724

18-
To allow your Jira instance to communicate with your locally running server, you need to have either [ngrok](https://ngrok.com/download) or [localtunnel](https://localtunnel.github.io/www/) installed and running.
25+
To allow Jira/Github to communicate with your locally running server, you need to have either [ngrok](https://ngrok.com/download) or [localtunnel](https://localtunnel.github.io/www/) installed and running.
1926

2027
This tunnel will expose a URL through which internet traffic can reach your local machine. This URL will be called `DOMAIN` in the rest of this document.
2128

@@ -102,10 +109,11 @@ After this is done, you should see your repos starting to sync in the App's dash
102109

103110
Thank you so much for willing to contribute to this project!
104111

105-
Before you spend time working on something, it might be worth [discussing your changes with other contributors](https://github.com/integrations/jira/discussions) before starting for guidance and potentially combining efforts with other members. Remember to try to keep your changes simple and concise - do not try to fix everything in one Pull Request. We'd much appreciate multiple smaller PRs over one massive one. We're also here to help, so if you're stuck or blocked, please feel free to reach out.
112+
Before you spend time working on something, it might be worth [discussing your changes with other contributors](https://github.com/atlassian/github-for-jira/discussions) before starting for guidance and potentially combining efforts with other members. Remember to try to keep your changes simple and concise - do not try to fix everything in one Pull Request. We'd much appreciate multiple smaller PRs over one massive one. We're also here to help, so if you're stuck or blocked, please feel free to reach out.
106113

107114
That being said, here are the steps needed to create a Pull Request for us to review:
108115

116+
1. [Sign the CLA first!](#contributor-license-agreement)
109117
1. Fork the repository.
110118
1. Do your changes either on the main branch or create a new one.
111119
1. Make sure the tests pass on your machine with `npm test` and the build works with `npm run build`. If you're adding new functionality, please add tests to reflect this.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017-2018 GitHub
3+
Copyright (c) 2021 Atlassian Pty Ltd
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# GitHub.com + Jira Software integration
2-
3-
| Build |
4-
|-------|
5-
| [![Build Status](https://travis-ci.com/integrations/jira.svg?branch=master)](https://travis-ci.com/integrations/jira) |
1+
# GitHub For Jira
62

73
## About
8-
Connect your code with your project management in Jira. A separate Jira subscription is required. With two of your most important tools connected, you'll spend less time managing projects and more time working on them. This integration is an open source project, built and maintained by GitHub.
4+
5+
Connect your Github code with your project management in Jira. A separate Jira subscription is required. With two of your most important tools connected, you'll spend less time managing projects and more time working on them. This integration is an open source project, built and maintained by [Atlassian](https://atlassian.com).
96

107
## Table of Contents
118
- [Installation and setup](#installation-and-setup)

SUPPORT.md

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Questions? Need help? You've come to the right place
22

3-
This file will help you troubleshoot the common issues that can occur with the GitHub.com + Jira Software integration.
3+
This file will help you troubleshoot the common issues that can occur with the GitHub for Jira integration.
44

55
## Table of Contents
66

77
- [App is not responding](#app-is-not-responding)
88
- [Sync status not reaching complete](#sync-status-not-reaching-complete)
99
- [Nothing showing up in Jira](#nothing-showing-up-in-jira)
1010
- [Workflow transitions are not running](#workflow-transitions-are-not-running)
11-
- [Getting additional help](#getting-additional-help)
1211

1312
## App is not responding
1413

@@ -19,7 +18,7 @@ Uninstalling and reinstalling the integration is the most common fix for this.
1918
1. Click **Uninstall** from the Manage Apps page of your Jira settings.
2019
2. Visit the Atlassian Marketplace and install the [GitHub for Jira app](https://marketplace.atlassian.com/apps/1219592/github-for-jira?hosting=cloud&tab=overview).
2120

22-
Still having trouble? [Contact GitHub Support for additional help](#getting-additional-help).
21+
Still having trouble? Look up your problem in [Issues](https://github.com/atlassian/github-for-jira/issues) or [Create a new Issue](https://github.com/atlassian/github-for-jira/issues/new) if it doesn't already exist.
2322

2423
## Sync status not reaching complete
2524

@@ -58,7 +57,7 @@ This will rediscover all repositories in your installation and start a new sync.
5857

5958
This warning is shown when a branch or commit includes more than 100 issue keys. When a branch or commit exceeds this limit, we only send the first 100. This is enforced by Jira. This doesn't impact branches or commits that are under the limit or impact the sync status.
6059

61-
Still having trouble? [Contact GitHub Support for additional help](#getting-additional-help).
60+
Still having trouble? Look up your problem in [Issues](https://github.com/atlassian/github-for-jira/issues) or [Create a new Issue](https://github.com/atlassian/github-for-jira/issues/new) if it doesn't already exist.
6261

6362
## Sync is STALLED
6463

@@ -69,17 +68,17 @@ To resolve, follow these steps to resume the sync:
6968
1. Open the integration settings: **Jira Settings** -> **Add-ons** -> **Manage Add-ons** -> **GitHub** -> **Get started**
7069
2. Under **Retry**, click the dropdown and select "Normal", then click **Submit**
7170

72-
If the sync returns to the STALLED status, [contact GitHub Support for additional help](#getting-additional-help).
71+
If the sync returns to the STALLED status, Look up your problem in [Issues](https://github.com/atlassian/github-for-jira/issues) or [Create a new Issue](https://github.com/atlassian/github-for-jira/issues/new) if it doesn't already exist.
7372

7473
## Nothing showing up in Jira
7574

7675
First [check that your sync status has reached `COMPLETE`](#sync-status-not-reaching-complete). No information will be displayed in Jira until the status is `COMPLETE`.
7776

7877
Next check that you're adding your Jira issue keys in your commits, branches, or pull request titles. These are the only places on GitHub where you can put your Jira issue keys that will cause updates to be sent to the Jira issue.
7978

80-
For more information, check out [Using the integration](https://github.com/integrations/jira#using-the-integration).
79+
For more information, check out [Using the integration](https://github.com/atlassian/github-for-jira#using-the-integration).
8180

82-
Still having trouble? [Contact GitHub Support for additional help](#getting-additional-help).
81+
Still having trouble? Look up your problem in [Issues](https://github.com/atlassian/github-for-jira/issues) or [Create a new Issue](https://github.com/atlassian/github-for-jira/issues/new) if it doesn't already exist.
8382

8483
## Workflow transitions are not running
8584

@@ -91,10 +90,4 @@ You can check the email address on GitHub by adding `.patch` to the end of a com
9190

9291
`https://github.com/atom/atom/commit/834f8f3d73d84e98a423fe0720abd833d5ca7a87.patch`
9392

94-
Still having trouble? [Contact GitHub Support for additional help](#getting-additional-help).
95-
96-
## Getting additional help
97-
98-
Please fill out GitHub's [Support form](https://github.com/contact?form%5Bsubject%5D=Re:+GitHub%2BJira+Integration) and your request will be routed to the right team at GitHub.
99-
100-
Be sure to include the details of any troubleshooting steps you've tried so far.
93+
Still having trouble? Look up your problem in [Issues](https://github.com/atlassian/github-for-jira/issues) or [Create a new Issue](https://github.com/atlassian/github-for-jira/issues/new) if it doesn't already exist.

app.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ default_permissions:
129129
# name: Jira Dev Environment
130130

131131
# The homepage of your GitHub App.
132-
# url: https://github.com/integrations/jira
132+
# url: https://github.com/atlassian/github-for-jira
133133

134134
# A description of the GitHub App.
135-
# description: An app to do local development for the official Jira GitHub App - https://github.com/integrations/jira
135+
# description: An app to do local development for the official Jira GitHub App - https://github.com/atlassian/github-for-jira
136136

137137
# Set to true when your GitHub App is available to the public or false when it is only accessible to the owner of the app.
138138
# Default: true

docs/architecture/decisions/0001-record-architecture-decisions.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/architecture/decisions/0002-implement-hydro-events-for-activity-tracking.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)