Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo authored Jun 11, 2018
2 parents 5c80c28 + 725d3e0 commit 1a10e5a
Show file tree
Hide file tree
Showing 212 changed files with 36,713 additions and 17,463 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.65.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.65.0-develop
ENV RC_VERSION 0.66.0-develop

MAINTAINER [email protected]

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,3 +1,9 @@
---
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).

Expand Down
Loading

0 comments on commit 1a10e5a

Please sign in to comment.