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

TM v4.4.14 (Hotfix) #5093

Closed
wants to merge 47 commits into from
Closed

TM v4.4.14 (Hotfix) #5093

wants to merge 47 commits into from

Conversation

dakotabenjamin
Copy link
Member

No description provided.

willemarcel and others added 30 commits December 20, 2021 17:01
Suggesting to add two Issue templates that will help user in providing relevant information.
I added a PR for the BUG  template (#5026) and now adding for  a FEATURE.
@dakotabenjamin thanks for the comment on the smartphone. I have removed now.
I have now simplified the labels list.   As discussed,  I have updated the contributing guidelines to reflect the changes and explain the different ways in which people can contribute.

The plan is to keep this page up to date with any changes/updates as we continue the collaboration with the collective.
Simplified and updated the text. Removed the page referencing Working Group meetings

@dakotabenjamin kept the developer section as is and we can update later on. On the instances, we can also update later on if there are other instances missing.
Cleans up some code I left in the last release, and rebases to master
dakotabenjamin and others added 16 commits March 28, 2022 10:32
Enable OpsGenie webhook by fixing yaml syntax
* Add error message for 403 status code

* Update test cases

* Update translation source

* add sub-codes in error response

* add sub-codes on error response for tasks API

* fix formatting

* fix formatting

* fix formatting

* add subcodes on projects response

* Include error messages for lock error subcodes

* add subcode on error response

* fix formatting

* fix formatting

Co-authored-by: Aadesh-Baral <[email protected]>
* Bump marked from 2.1.3 to 4.0.12 in /frontend

Bumps [marked](https://github.com/markedjs/marked) from 2.1.3 to 4.0.12.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](markedjs/marked@v2.1.3...v4.0.12)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Use parse to render HTML

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Hel Nershing Thapa <[email protected]>
* Handle self intersection tile exception

* Add trim task grid error message

Co-authored-by: Hel Nershing Thapa <[email protected]>
* Add error code document in docs
* Fix user tasks sorting

* Add option to sort tasks by project id in desc

* Add dropdown to sort tasks

Co-authored-by: Hel Nershing Thapa <[email protected]>
@dakotabenjamin
Copy link
Member Author

dakotabenjamin commented Apr 11, 2022

It would appear that my name was added to the commits from the last release PR and now the branches have diverged. Normally we use the "Rebase and merge" option when merging these released to master and that shouldn't affect the commits, except in the case of GitHub, they update the authorship. See this doc for more details.

I want to propose that we actually change our process here and stop merging code back into master. It is a bit of an unnecessary step when we already tag commits for releases. What does it matter that the commits are on develop or master? We can still review pre-release code on tasks-staging as they are automatically deployed from develop. We don't perform feature freezes and are fairly diligent about deploying soon after a release is made, and in any case the deployment branches can be rebased against develop at a specific tag (such as "v4.4.13").

Bumps [sentry-sdk[flask]](https://github.com/getsentry/sentry-python) from 0.19.3 to 1.5.8.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-python@0.19.3...1.5.8)

---
updated-dependencies:
- dependency-name: sentry-sdk[flask]
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
6.2% 6.2% Duplication

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants