Skip to content

Commit

Permalink
Merge branch 'develop' into dependencies-update
Browse files Browse the repository at this point in the history
* develop: (79 commits)
  Fix CI deploy job (#12803)
  Convert rocketchat-retention-policy to main module structure (#12797)
  Convert rocketchat-push-notifications to main module structure (#12778)
  Convert rocketchat-otr to main module structure (#12777)
  Convert rocketchat-oembed to main module structure (#12775)
  Convert rocketchat-migrations to main-module structure (#12772)
  Convert rocketchat-message-mark-as-unread to main module structure (#12766)
  Remove conventional changelog cli, we are using our own cli now (Houston) (#12798)
  Convert rocketchat-message-attachments to main module structure (#12760)
  Convert rocketchat-message-action to main module structure (#12759)
  Convert rocketchat-mentions-flextab to main module structure (#12757)
  Convert rocketchat-mentions to main module structure (#12756)
  Convert rocketchat-markdown to main module structure (#12755)
  Convert tocketchat-mapview to main module structure (#12701)
  Add check to make sure releases actually was updated (#12791)
  Bump version to 0.73.0-develop
  Release 0.72.0 (#12742)
  Create LIMITATION_OF_RESPONSIBILITY.md
  Update Apps Engine to 1.3.1 (#12741)
  Regression: Expand Administration sections by toggling section title (#12736)
  ...

# Conflicts:
#	.scripts/set-version.js
#	package-lock.json
#	package.json
  • Loading branch information
engelgabriel committed Dec 3, 2018
2 parents dde0587 + 4eb4d52 commit 14e626d
Show file tree
Hide file tree
Showing 430 changed files with 4,989 additions and 3,306 deletions.
2 changes: 1 addition & 1 deletion .circleci/setartname.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
else
SNAP_CHANNEL=edge
RC_RELEASE=develop
RC_VERSION=0.66.0-develop
RC_VERSION="$(npm run version --silent)"
fi

export SNAP_CHANNEL
Expand Down
3 changes: 3 additions & 0 deletions .circleci/update-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ IFS=$'\n\t'
curl -X POST \
-H "X-Update-Token: ${UPDATE_TOKEN}" \
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 0.72.0-develop
ENV RC_VERSION 0.73.0-develop

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 @@ -10,7 +10,6 @@ packages/rocketchat-livechat/.app/.meteor
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/vendor/
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
Expand Down
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"Package" : false,
"parentCall" : false,
"RocketChat" : true,
"RocketChatFile" : false,
"RoomHistoryManager" : false,
"RoomManager" : false,
"ServiceConfiguration" : false,
Expand Down
116 changes: 0 additions & 116 deletions .github/changelog.js

This file was deleted.

2 changes: 1 addition & 1 deletion .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"userLogin": "rodrigok",
"contributors": []
}],
"0.72.0": [{
"0.72.0-rc.0": [{
"title": "[BREAK] Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued",
"userLogin": "sampaiodiego",
"contributors": []
Expand Down
Loading

0 comments on commit 14e626d

Please sign in to comment.