Skip to content

Commit

Permalink
Merge branch 'new/apps_rewrite' of github.com:RocketChat/Rocket.Chat …
Browse files Browse the repository at this point in the history
…into new/apps_rewrite

* 'new/apps_rewrite' of github.com:RocketChat/Rocket.Chat: (31 commits)
  Readme: Update Raspberry Pi 2 to Pi 4 (#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (#16273)
  [FIX] Spotify embed link opens in same tab (#13637)
  [FIX] Markdown links not accepting URLs with parentheses (#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (#16135)
  [NEW] Highlight matching words in message search results (#16166)
  [FIX] Set `x-content-type-options: nosniff` header (#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (#16262)
  Fixes some italian word (#14008)
  Submit a payload to the release service when a release happens (#17775)
  Bump version to 3.4.0-develop
  Bump version to 3.3.0
  Bump version to 3.3.0-rc.4
  Bump version to 3.3.0-rc.3
  Bump version to 3.3.0-rc.2
  Bump version to 3.3.0-rc.1
  Bump version to 3.3.0-rc.0
  [FIX] Slack importer Link handling (#17595)
  ...
  • Loading branch information
gabriellsh committed Jun 1, 2020
2 parents bbc1c75 + ae465e2 commit 1658818
Show file tree
Hide file tree
Showing 31 changed files with 1,929 additions and 71 deletions.
6 changes: 3 additions & 3 deletions .circleci/update-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
set -euvo pipefail
IFS=$'\n\t'

curl -X POST \
-H "X-Update-Token: ${UPDATE_TOKEN}" \
https://releases.rocket.chat/update
curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
"{\"commit\": \"$CIRCLE_SHA1\", \"tag\": \"$CIRCLE_TAG\", \"branch\": \"$CIRCLE_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\" }" \
https://releases.rocket.chat/update

# Makes build fail if the release isn't there
curl --fail https://releases.rocket.chat/$RC_VERSION/info
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 3.3.0-develop
ENV RC_VERSION 3.4.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading

0 comments on commit 1658818

Please sign in to comment.