Skip to content

Commit

Permalink
Merge pull request #7752 from RocketChat/master-release
Browse files Browse the repository at this point in the history
Release 0.58.0
  • Loading branch information
rodrigok authored Aug 16, 2017
2 parents 0bcfd3e + 99a163c commit 9a9f158
Show file tree
Hide file tree
Showing 252 changed files with 11,808 additions and 2,459 deletions.
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:4

ENV RC_VERSION 0.57.3
ENV RC_VERSION 0.58.0

MAINTAINER buildmaster@rocket.chat

Expand Down
44 changes: 39 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,40 @@
<!-- INSTRUCTION: Complete the information below from your Administration page -->
<!--
Rocket.Chat Version:
Running Instances:
DB Replicaset OpLog:
Node Version:
Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
If you have questions or are looking for help/support please see: https://rocket.chat/docs/getting-support
If you are experiencing a bug please search our issues to be sure it is not already present: https://github.com/RocketChat/Rocket.Chat/issues
-->

### 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:

### Steps to Reproduce:

1. <!-- First Step -->
2. <!-- Second Step -->
3. <!-- and so on... -->

### Expected behavior:

<!-- What you expect to happen -->

### Actual behavior:

<!-- What actually happens -->

### Relevant logs:
<!-- 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: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
**/node_modules/*
**/tmp/*
**/.meteor/dev_bundle
**/.meteor/local*
**/.meteor/meteorite
/private/certs/*
*.bak
*.iml
Expand Down Expand Up @@ -34,13 +36,10 @@
.env
.externalToolBuilders
.idea
.vscode
.loadpath
.map
.metadata
.meteor/local*
.meteor/meteorite
.meteor/dev_bundle
packages/rocketchat-livechat/app/.meteor/dev_bundle
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
.mule
.pmd
Expand Down
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
31 changes: 17 additions & 14 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
# but you can also edit it by hand.

rocketchat:cors
accounts-facebook@1.1.1
accounts-github@1.2.1
accounts-google@1.1.2
accounts-meteor-developer@1.2.1
accounts-password@1.3.6
accounts-twitter@1.2.1
accounts-facebook@1.2.1
accounts-github@1.3.0
accounts-google@1.2.0
accounts-meteor-developer@1.3.0
accounts-password@1.4.0
accounts-twitter@1.3.0
blaze-html-templates
check@1.2.5
ddp-rate-limiter@1.0.7
ecmascript@0.7.3
ecmascript@0.8.1
ejson@1.0.13
email@1.2.1
email@1.2.3
fastclick@1.0.13
http@1.2.12
jquery@1.11.10
less@2.7.9
logging@1.1.17
meteor-base@1.0.4
meteor-base@1.1.0
mobile-experience@1.0.4
mongo@1.1.17
mongo@1.1.19
random@1.0.10
rate-limit@1.0.8
reactive-dict@1.1.8
reactive-dict@1.1.9
reactive-var@1.0.11
reload@1.1.11
service-configuration@1.0.11
session@1.1.7
shell-server@0.2.3
shell-server@0.2.4
spacebars
standard-minifier-js@2.0.0
standard-minifier-js@2.1.1
tracker@1.1.3

rocketchat:2fa
Expand Down Expand Up @@ -98,6 +98,7 @@ rocketchat:slackbridge
rocketchat:slashcommands-archive
rocketchat:slashcommands-asciiarts
rocketchat:slashcommands-create
rocketchat:slashcommands-help
rocketchat:slashcommands-invite
rocketchat:slashcommands-invite-all
rocketchat:slashcommands-join
Expand All @@ -109,6 +110,7 @@ rocketchat:slashcommands-mute
rocketchat:slashcommands-open
rocketchat:slashcommands-topic
rocketchat:slashcommands-unarchive
rocketchat:slider
rocketchat:smarsh-connector
rocketchat:spotify
rocketchat:statistics
Expand Down Expand Up @@ -149,7 +151,7 @@ jalik:ufs-gridfs
jparker:gravatar
kadira:blaze-layout
kadira:flow-router
kenton:accounts-sandstorm
#kenton:accounts-sandstorm
mizzao:autocomplete
mizzao:timesync
mrt:reactive-store
Expand All @@ -171,3 +173,4 @@ yasaricli:slugify
yasinuslu:blaze-meta
deepwell:bootstrap-datepicker2
rocketchat:postcss
dynamic-import@0.1.1
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.4.2
METEOR@1.5.1
76 changes: 40 additions & 36 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,45 +1,48 @@
accounts-base@1.2.17
accounts-facebook@1.1.1
accounts-github@1.2.1
accounts-google@1.1.2
accounts-meteor-developer@1.2.1
accounts-base@1.3.1
accounts-facebook@1.2.1
accounts-github@1.3.0
accounts-google@1.2.0
accounts-meteor-developer@1.3.0
accounts-oauth@1.1.15
accounts-password@1.3.6
accounts-twitter@1.2.1
accounts-password@1.4.0
accounts-twitter@1.3.0
aldeed:simple-schema@1.5.3
allow-deny@1.0.5
allow-deny@1.0.6
autoupdate@1.3.12
babel-compiler@6.18.2
babel-compiler@6.19.4
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.0.11
boilerplate-generator@1.1.1
caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.0.10
cfs:http-methods@0.0.32
check@1.2.5
coffeescript@1.12.3_1
coffeescript@1.12.6_1
dandv:caret-position@2.1.1
ddp@1.2.5
ddp-client@1.3.4
ddp-common@1.2.8
ddp@1.3.0
ddp-client@2.0.0
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@1.3.14
ddp-server@2.0.0
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.0.7
dispatch:run-as-user@1.1.1
ecmascript@0.7.3
ecmascript-runtime@0.3.15
dynamic-import@0.1.1
ecmascript@0.8.2
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
edgee:slingshot@0.7.1
ejson@1.0.13
email@1.2.1
email@1.2.3
emojione:emojione@2.2.6
facebook-oauth@1.3.0
facebook-oauth@1.3.2
fastclick@1.0.13
francocatena:status@1.5.3
geojson-utils@1.0.10
Expand All @@ -59,7 +62,6 @@ jparker:gravatar@0.5.1
jquery@1.11.10
kadira:blaze-layout@2.3.0
kadira:flow-router@2.12.1
kenton:accounts-sandstorm@0.6.0
konecty:change-case@2.3.0
konecty:delayed-task@1.0.0
konecty:mongo-counter@0.0.5_3
Expand All @@ -69,52 +71,52 @@ konecty:user-presence@1.2.9
launch-screen@1.1.1
less@2.7.9
livedata@1.0.18
localstorage@1.0.12
localstorage@1.1.1
logging@1.1.17
matb33:collection-hooks@0.8.4
mdg:validation-error@0.5.1
meteor@1.6.1
meteor-base@1.0.4
meteor@1.7.0
meteor-base@1.1.0
meteor-developer-oauth@1.2.0
meteorhacks:inject-initial@1.0.4
meteorhacks:meteorx@1.4.1
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@2.0.0
minimongo@1.0.23
minifier-js@2.1.1
minimongo@1.2.1
mizzao:autocomplete@0.5.1
mizzao:timesync@0.3.4
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.8.2
modules-runtime@0.7.10
mongo@1.1.17
modules@0.9.2
modules-runtime@0.8.0
mongo@1.1.19
mongo-id@1.0.6
mongo-livedata@1.0.12
mrt:reactive-store@0.0.1
mystor:device-detection@0.2.0
nimble:restivus@0.8.12
nooitaf:colors@1.1.2_1
npm-bcrypt@0.9.2
npm-bcrypt@0.9.3
npm-mongo@2.2.24
oauth@1.1.13
oauth1@1.1.11
oauth2@1.1.11
observe-sequence@1.0.16
ordered-dict@1.0.9
ostrio:cookies@2.2.1
pauli:accounts-linkedin@2.1.2
ostrio:cookies@2.2.2
pauli:accounts-linkedin@2.1.3
pauli:linkedin-oauth@1.1.0
percolate:synced-cron@1.3.2
promise@0.8.8
promise@0.8.9
raix:eventemitter@0.1.3
raix:eventstate@0.0.4
raix:handlebar-helpers@0.2.5
raix:push@3.0.3-rc.7
raix:ui-dropped-event@0.0.7
random@1.0.10
rate-limit@1.0.8
reactive-dict@1.1.8
reactive-dict@1.1.9
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
Expand Down Expand Up @@ -188,6 +190,7 @@ rocketchat:slackbridge@0.0.1
rocketchat:slashcommands-archive@0.0.1
rocketchat:slashcommands-asciiarts@0.0.1
rocketchat:slashcommands-create@0.0.1
rocketchat:slashcommands-help@0.0.1
rocketchat:slashcommands-invite@0.0.1
rocketchat:slashcommands-invite-all@0.0.1
rocketchat:slashcommands-join@0.0.1
Expand All @@ -199,6 +202,7 @@ rocketchat:slashcommands-mute@0.0.1
rocketchat:slashcommands-open@0.0.1
rocketchat:slashcommands-topic@0.0.1
rocketchat:slashcommands-unarchive@0.0.1
rocketchat:slider@0.0.1
rocketchat:smarsh-connector@0.0.1
rocketchat:sms@0.0.1
rocketchat:spotify@0.0.1
Expand All @@ -224,13 +228,13 @@ routepolicy@1.0.12
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.3
shell-server@0.2.4
simple:json-routes@2.1.0
smoral:sweetalert@1.1.1
spacebars@1.0.15
spacebars-compiler@1.1.2
srp@1.0.10
standard-minifier-js@2.0.0
standard-minifier-js@2.1.1
steffo:meteor-accounts-saml@0.0.1
tap:i18n@1.8.2
templating@1.3.2
Expand All @@ -246,7 +250,7 @@ ui@1.0.13
underscore@1.0.10
underscorestring:underscore.string@3.3.4
url@1.1.0
webapp@1.3.15
webapp@1.3.17
webapp-hashing@1.0.9
yasaricli:slugify@0.0.7
yasinuslu:blaze-meta@0.3.3
26 changes: 25 additions & 1 deletion .openshift/rocket-chat-ephemeral.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,30 @@
"mountPath": "/app/uploads"
}
],
"readinessProbe": {
"httpGet": {
"path": "/api/v1/info",
"port": 3000,
"scheme": "HTTP"
},
"initialDelaySeconds": 5,
"timeoutSeconds": 1,
"periodSeconds": 10,
"successThreshold": 1,
"failureThreshold": 3
},
"livenessProbe": {
"httpGet": {
"path": "/api/v1/info",
"port": 3000,
"scheme": "HTTP"
},
"initialDelaySeconds": 30,
"timeoutSeconds": 1,
"periodSeconds": 10,
"successThreshold": 1,
"failureThreshold": 3
},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "Always"
}
Expand Down Expand Up @@ -416,4 +440,4 @@
"required": true
}
]
}
}
Loading

0 comments on commit 9a9f158

Please sign in to comment.