Merge branch 'develop' into apps-multi-instance-enablement

RocketChat · Feb 26, 2018 · 2822ad3 · 2822ad3
2 parents b468b06 + 5033cab
commit 2822ad3
Show file tree

Hide file tree

Showing 28 changed files with 393 additions and 399 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -14,12 +14,13 @@ If you are experiencing a bug please search our issues to be sure it is not alre
 
 ### Server Setup Information:
 
-* Version of Rocket.Chat Server:
-* Operating System:
-* Deployment Method(snap/docker/tar/etc):
+* Version of Rocket.Chat Server: 
+* Operating System: 
+* Deployment Method(snap/docker/tar/etc): 
 * Number of Running Instances: 
-* DB Replicaset Oplog:
-* Node Version:
+* DB Replicaset Oplog: 
+* Node Version: 
+* mongoDB Version: 
 
 ### Steps to Reproduce:
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,4 +9,6 @@
 <!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
 Closes #ISSUE_NUMBER
 
+<!-- INSTRUCTION: Link to a https://github.com/RocketChat/docs PR with added/updated documentation or an update to the missing/outdated documentation list, see https://rocket.chat/docs/contributing/documentation/  -->
+
 <!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
@@ -49,7 +49,7 @@ parts:
         build-packages:
             - curl
         plugin: dump
-        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc@1.6.6;
+        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; npm install grpc@1.6.6;
         after: [node]
         source: .
         stage-packages: