Skip to content

Commit

Permalink
Merge branch 'develop' into goalify
Browse files Browse the repository at this point in the history
* develop: (215 commits)
  [FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically (RocketChat#9959)
  [FIX] Notification not working for group mentions and not respecting ignored users (RocketChat#11024)
  fixed searchbar icon and text overlap (RocketChat#10294)
  [FIX] Link previews not being removed from messages after removed on editing (RocketChat#11063)
  avoid send presence without loggin
  Fix: Exception in metrics generation
  Update release template
  Update issue templates
  Update pt-BR.i18n.json
  LingoHub Update 🚀
  update import capnp
  update build for Sandstorm, add dependence capnp.
  LingoHub Update 🚀
  Fixing HTML on translation files
  Fixing HTML on translation files
  LingoHub Update 🚀
  Fixing HTML on translation files
  Fixing HTML on translation files
  Fixing HTML on translation files
  LingoHub Update 🚀
  ...

# Conflicts:
#	.meteor/packages
#	README.md
#	client/startup/startup.js
#	package-lock.json
#	packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-i18n/i18n/vi-VN.i18n.json
#	packages/rocketchat-livechat/config.js
#	server/startup/initialData.js
  • Loading branch information
trongthanh committed Jun 11, 2018
2 parents 1296cb2 + 725d3e0 commit 4668705
Show file tree
Hide file tree
Showing 370 changed files with 47,417 additions and 17,808 deletions.
12 changes: 11 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,12 @@ jobs:
- run:
name: Install dependencies
command: |
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
sudo apt-get update
sudo apt-get install -y mongodb-org-shell
sudo apt-get install -y mongodb-org-shell google-chrome-stable
- run:
name: Configure Replica Set
Expand Down Expand Up @@ -192,6 +194,14 @@ jobs:

- checkout

- run:
name: Install dependencies
command: |
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
sudo apt-get update
sudo apt-get install -y google-chrome-stable
- run:
name: NPM install
command: |
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.64.0-develop
ENV RC_VERSION 0.66.0-develop

MAINTAINER [email protected]

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.64.0-develop
ENV RC_VERSION 0.66.0-develop

MAINTAINER [email protected]

Expand Down
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
"parentCall" : false,
"Promise" : false,
"Random" : false,
"ReactiveDict" : false,
"ReactiveVar" : false,
"Reload" : false,
"RocketChat" : true,
Expand Down
43 changes: 27 additions & 16 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
---
name: Bug report
about: Create a report to help us improve

---

<!--
Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
Expand All @@ -10,22 +16,12 @@ If you are experiencing a bug please search our issues to be sure it is not alre

### Description:

<!-- Description of the issue -->

### Server Setup Information:

* Version of Rocket.Chat Server:
* Operating System:
* Deployment Method(snap/docker/tar/etc):
* Number of Running Instances:
* DB Replicaset Oplog:
* Node Version:
* mongoDB Version:
<!-- A clear and concise description of what the bug is. -->

### Steps to Reproduce:
### Steps to reproduce:

1. <!-- First Step -->
2. <!-- Second Step -->
1. <!-- Go to '...' -->
2. <!-- Click on '....' -->
3. <!-- and so on... -->

### Expected behavior:
Expand All @@ -34,8 +30,23 @@ If you are experiencing a bug please search our issues to be sure it is not alre

### Actual behavior:

<!-- What actually happens -->
<!-- What actually happens with SCREENSHOT, if applicable -->

### Server Setup Information:

- Version of Rocket.Chat Server:
- Operating System:
- Deployment Method: <!-- snap/docker/tar/etc -->
- Number of Running Instances:
- DB Replicaset Oplog:
- NodeJS Version:
- MongoDB Version:

### Additional context

<!-- Add any other context about the problem here. -->

### Relevant logs:
<!-- Logs from both server and browser -->

<!-- Logs from both SERVER and BROWSER -->
<!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.

---


17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
---
name: Release
about: Internal release checklist template

---

# Release {version}
We are releasing a new version, this issue will keep track of the progress between the first release candidate (20th of each month) to the final release (27th of each month).

After the 20th of each month we start the release process that ends 7 days after, during that period we enter a Feature Freeze. While in the Feature Freeze, we will only be merging bug fixes and not new features.
Beginning on the 20th of each month, we will start the release process which ends 7 days later (the 27th). During this period of time, we will enter a "Feature Freeze". This Feature Freeze means that we will only be merging pull requests which fix bugs and not ones which add new features.

For any regression, open a new issue and link to this one.
When you find a bug that is a regression, please open a new issue and link it to this one.


## Before Release - Preparation - 1 business day before the day 20th
- [x] Create the issue to track the release progress
- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post
- [ ] Talk to the Marketing Team about the Blog Post release
- [ ] Talk to the Documentation Team about the Docs release
- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post <!-- link to the website's issue -->
- [ ] Talk to the Marketing Team about starting the release Blog Post
- [ ] Talk to the Documentation Team about ensuring the Docs are up to date and all pull requests are merged
- [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard)

## Release Candidate 1 - On the 20th
Expand All @@ -19,17 +25,17 @@ For any regression, open a new issue and link to this one.
- [ ] On branch `release-candidate` run `npm run release` and follow the steps
- [ ] Publish the branch and the generated tag
- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
- [ ] Ensure the build is passing on CircleCI
- [ ] Ensure the build is passing on Docker Hub
- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
- [ ] Ensure the build is passing on [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/builds/)

<!-- Copy following block for next release candidates
## Release Candidate {release-candidate-version}
- [ ] Merge `develop` into `release-candidate` branch
- [ ] On branch `release-candidate` run `npm run release` and follow the steps
- [ ] Publish the branch and the generated tag
- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
- [ ] Ensure the build is passing on CircleCI
- [ ] Ensure the build is passing on Docker Hub
- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
- [ ] Ensure the build is passing on [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/builds/)
-->

## Final Release - On the 27th
Expand All @@ -44,16 +50,18 @@ For any regression, open a new issue and link to this one.
- [ ] Paste the history removing the version from the first line
- [ ] Save as **draft**
- [ ] Create a PR from the branch `release-{version}` with the same history from the tag/release
- [ ] Ensure the build is passing on CircleCI
- [ ] Ensure the build is passing on Docker Hub
- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
- [ ] Ensure the build is passing on [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/builds/)
- [ ] When build is passing ask for approval
- [ ] When approved merge it!
- [ ] When merged edit the release/tag and publish it

## After Release - Conclusion - 1 business day after the 27th
- [ ] Check if related issues was closed
- [ ] Check if related issues was assigned to the correct milestone
- [ ] Check with the Marketing Team about the Blog Post release
- [ ] Ensure all of the related issues were closed
- [ ] Determine if all of the related issues were correctly assigned to the this version's milestone
- [ ] Get an update from Marketing Team about the release Blog Post
- [ ] Check with the Documentation Team about the Docs release
- [ ] Create a Sync PR to merge back master to develop
- [ ] Create a Sync PR to merge `master` back into `develop`
- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
- [ ] When build has passed, ask for approval and wait
- [ ] Merge Sync PR
Loading

0 comments on commit 4668705

Please sign in to comment.