Skip to content

Commit

Permalink
Merge pull request #10613 from RocketChat/release-0.64.0
Browse files Browse the repository at this point in the history
Release 0.64.0
  • Loading branch information
rodrigok authored Apr 28, 2018
2 parents cbc951c + 6dc6c18 commit 2fae79a
Show file tree
Hide file tree
Showing 361 changed files with 20,331 additions and 3,880 deletions.
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
<<: *defaults
docker:
- image: circleci/node:8
- image: circleci/node:8.9

steps:
- checkout
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
test-with-oplog:
<<: *defaults
docker:
- image: circleci/node:8-browsers
- image: circleci/node:8.9-browsers
- image: mongo:3.4
command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]

Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
test-without-oplog:
<<: *defaults
docker:
- image: circleci/node:8-browsers
- image: circleci/node:8.9-browsers
- image: circleci/mongo:3.4

environment:
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
deploy:
<<: *defaults
docker:
- image: circleci/node:8
- image: circleci/node:8.9

steps:
- attach_workspace:
Expand Down Expand Up @@ -247,6 +247,7 @@ jobs:
bash .circleci/update-releases.sh
bash .circleci/docker.sh
bash .circleci/snap.sh
bash .circleci/redhat-registry.sh
workflows:
version: 2
Expand Down
12 changes: 12 additions & 0 deletions .circleci/redhat-registry.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

if [[ $CIRCLE_TAG ]]; then
curl -X POST \
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-H 'Cache-Control: no-cache' \
-H 'Content-Type: application/json' \
-d '{"tag":"'$CIRCLE_TAG'"}'
fi
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.63.3
ENV RC_VERSION 0.64.0

MAINTAINER buildmaster@rocket.chat

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.63.3
ENV RC_VERSION 0.64.0

MAINTAINER buildmaster@rocket.chat

Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ packages/rocketchat-katex/client/katex/katex.min.js
packages/rocketchat-livechat/.app/node_modules
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat-migrations/
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"curly": [2, "all"],
"eqeqeq": [2, "allow-null"],
"new-cap": [2, {
"capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
"capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.OneOf", "Match.Where", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
}],
"use-isnan": 2,
"valid-typeof": 2,
Expand Down
3 changes: 0 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<!-- [FIX] For bug fixes -->
<!-- [BREAK] For pull requests including breaking changes -->

<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
@RocketChat/core

<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
Closes #ISSUE_NUMBER

Expand Down
7 changes: 6 additions & 1 deletion .github/bot-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ whitelist:
- theorenck
- JSzaszvari
labels:
- "Contributions: welcome"
- "Contributions: only core team"
- "Feature: Request"
- "Feature: Planned"
- "type: bug"
- "help wanted"
- duplicate
- enhancement
- "help wanted"
- invalid
- question
- wontfix
Loading

0 comments on commit 2fae79a

Please sign in to comment.