Merge pull request #13323 from RocketChat/release-0.74.1

Release 0.74.1

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.74.0
+ENV RC_VERSION 0.74.1
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -24479,6 +24479,16 @@
         "4.0"
       ],
       "pull_requests": [
+        {
+          "pr": "13052",
+          "title": "Release 0.73.1",
+          "userLogin": "rodrigok",
+          "milestone": "0.73.1",
+          "contributors": [
+            "sampaiodiego",
+            "rodrigok"
+          ]
+        },
         {
           "pr": "13049",
           "title": "Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB",
@@ -24518,6 +24528,15 @@
         "4.0"
       ],
       "pull_requests": [
+        {
+          "pr": "13086",
+          "title": "Release 0.73.2",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "graywolf336",
+            "sampaiodiego"
+          ]
+        },
         {
           "pr": "13013",
           "title": "[NEW] Cloud Integration",
@@ -25352,6 +25371,22 @@
         "4.0"
       ],
       "pull_requests": [
+        {
+          "pr": "13270",
+          "title": "Release 0.74.0",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "rodrigok",
+            "web-flow",
+            "sampaiodiego",
+            "tassoevan",
+            "supra08",
+            "graywolf336",
+            "MarcosSpessatto",
+            "Xuhao",
+            "d-gubert"
+          ]
+        },
         {
           "pr": "13213",
           "title": "Regression: Fix message pinning",
@@ -25406,6 +25441,138 @@
           ]
         }
       ]
+    },
+    "0.74.1": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "13311",
+          "title": "[NEW] Limit all DDP/Websocket requests (configurable via admin panel)",
+          "userLogin": "rodrigok",
+          "milestone": "0.74.1",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "13322",
+          "title": "[FIX] Mobile view and re-enable E2E tests",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.74.1",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "13308",
+          "title": "[NEW] REST endpoint to forward livechat rooms",
+          "userLogin": "renatobecker",
+          "milestone": "0.74.1",
+          "contributors": [
+            "renatobecker",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "13293",
+          "title": "[FIX] Hipchat Enterprise Importer not generating subscriptions",
+          "userLogin": "Hudell",
+          "milestone": "0.74.1",
+          "contributors": [
+            "Hudell",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "13294",
+          "title": "[FIX] Message updating by Apps",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.74.1",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "13306",
+          "title": "[FIX]  REST endpoint for creating custom emojis",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.74.1",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "13303",
+          "title": "[FIX] Preview of image uploads were not working when apps framework is enable",
+          "userLogin": "rodrigok",
+          "milestone": "0.74.1",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "13221",
+          "title": "[FIX] HipChat Enterprise importer fails when importing a large amount of messages (millions)",
+          "userLogin": "Hudell",
+          "milestone": "0.74.1",
+          "contributors": [
+            "Hudell",
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "11525",
+          "title": "[NEW] Collect data for Monthly/Daily Active Users for a future dashboard",
+          "userLogin": "renatobecker",
+          "milestone": "0.74.1",
+          "contributors": [
+            "renatobecker",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "13248",
+          "title": "[NEW] Add parseUrls field to the apps message converter",
+          "userLogin": "d-gubert",
+          "milestone": "0.74.1",
+          "contributors": [
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "13282",
+          "title": "Fix: Missing export in cloud package",
+          "userLogin": "geekgonecrazy",
+          "milestone": "0.74.1",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "12341",
+          "title": "[FIX] Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.74.1",
+          "contributors": [
+            "MarcosSpessatto",
+            "rodrigok",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }

.sandstorm/sandstorm-pkgdef.capnp

@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 126,  # Increment this for every release.
+		appVersion = 127,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.74.0"),
+		appMarketingVersion = (defaultText = "0.74.1"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.74.0
+    RC_VERSION=0.74.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,6 +1,49 @@
 
+# 0.74.1
+`2019-02-01  ·  4 🎉  ·  7 🐛  ·  1 🔍  ·  8 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🎉 New features
+
+- Limit all DDP/Websocket requests (configurable via admin panel) ([#13311](https://github.com/RocketChat/Rocket.Chat/pull/13311))
+- REST endpoint to forward livechat rooms ([#13308](https://github.com/RocketChat/Rocket.Chat/pull/13308))
+- Collect data for Monthly/Daily Active Users for a future dashboard ([#11525](https://github.com/RocketChat/Rocket.Chat/pull/11525))
+- Add parseUrls field to the apps message converter ([#13248](https://github.com/RocketChat/Rocket.Chat/pull/13248))
+
+### 🐛 Bug fixes
+
+- Mobile view and re-enable E2E tests ([#13322](https://github.com/RocketChat/Rocket.Chat/pull/13322))
+- Hipchat Enterprise Importer not generating subscriptions ([#13293](https://github.com/RocketChat/Rocket.Chat/pull/13293))
+- Message updating by Apps ([#13294](https://github.com/RocketChat/Rocket.Chat/pull/13294))
+- REST endpoint for creating custom emojis ([#13306](https://github.com/RocketChat/Rocket.Chat/pull/13306))
+- Preview of image uploads were not working when apps framework is enable ([#13303](https://github.com/RocketChat/Rocket.Chat/pull/13303))
+- HipChat Enterprise importer fails when importing a large amount of messages (millions) ([#13221](https://github.com/RocketChat/Rocket.Chat/pull/13221))
+- Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room ([#12341](https://github.com/RocketChat/Rocket.Chat/pull/12341))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Fix: Missing export in cloud package ([#13282](https://github.com/RocketChat/Rocket.Chat/pull/13282))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
 # 0.74.0
-`2019-01-27  ·  10 🎉  ·  11 🚀  ·  17 🐛  ·  39 🔍  ·  24 👩‍💻👨‍💻`
+`2019-01-28  ·  10 🎉  ·  11 🚀  ·  17 🐛  ·  38 🔍  ·  24 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -57,8 +100,8 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+- Release 0.74.0 ([#13270](https://github.com/RocketChat/Rocket.Chat/pull/13270) by [@Xuhao](https://github.com/Xuhao) & [@supra08](https://github.com/supra08))
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
-- Release 0.73.2 ([#13086](https://github.com/RocketChat/Rocket.Chat/pull/13086))
 - LingoHub based on develop ([#13201](https://github.com/RocketChat/Rocket.Chat/pull/13201))
 - Language: Edit typo "Обновлить" ([#13177](https://github.com/RocketChat/Rocket.Chat/pull/13177) by [@zpavlig](https://github.com/zpavlig))
 - Regression: Fix export AudioRecorder ([#13192](https://github.com/RocketChat/Rocket.Chat/pull/13192))
@@ -91,7 +134,6 @@
 - Move rocketchat settings to specific package ([#13026](https://github.com/RocketChat/Rocket.Chat/pull/13026))
 - Remove incorrect pt-BR translation ([#13074](https://github.com/RocketChat/Rocket.Chat/pull/13074))
 - Merge master into develop & Set version to 0.74.0-develop ([#13050](https://github.com/RocketChat/Rocket.Chat/pull/13050) by [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
-- Release 0.73.2 ([#13086](https://github.com/RocketChat/Rocket.Chat/pull/13086))
 - Regression: Fix audio message upload ([#13224](https://github.com/RocketChat/Rocket.Chat/pull/13224))
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
 - Regression: Fix emoji search ([#13207](https://github.com/RocketChat/Rocket.Chat/pull/13207))
@@ -130,7 +172,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.73.2
-`2019-01-07  ·  1 🎉  ·  3 👩‍💻👨‍💻`
+`2019-01-07  ·  1 🎉  ·  1 🔍  ·  3 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -141,14 +183,21 @@
 
 - Cloud Integration ([#13013](https://github.com/RocketChat/Rocket.Chat/pull/13013))
 
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Release 0.73.2 ([#13086](https://github.com/RocketChat/Rocket.Chat/pull/13086))
+
+</details>
+
 ### 👩‍💻👨‍💻 Core Team 🤓
 
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@graywolf336](https://github.com/graywolf336)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.73.1
-`2018-12-28  ·  1 🐛  ·  2 🔍  ·  2 👩‍💻👨‍💻`
+`2018-12-28  ·  1 🐛  ·  3 🔍  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -162,6 +211,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+- Release 0.73.1 ([#13052](https://github.com/RocketChat/Rocket.Chat/pull/13052))
 - Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB ([#13049](https://github.com/RocketChat/Rocket.Chat/pull/13049))
 - Regression: Get room's members list not working on MongoDB 3.2 ([#13051](https://github.com/RocketChat/Rocket.Chat/pull/13051))
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.74.0",
+	"version": "0.74.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

packages/rocketchat-api/server/settings.js

@@ -4,9 +4,6 @@ RocketChat.settings.addGroup('General', function() {
 	this.section('REST API', function() {
 		this.add('API_Upper_Count_Limit', 100, { type: 'int', public: false });
 		this.add('API_Default_Count', 50, { type: 'int', public: false });
-		this.add('API_Enable_Rate_Limiter_Dev', true, { type: 'boolean', public: false });
-		this.add('API_Enable_Rate_Limiter_Limit_Calls_Default', 10, { type: 'int', public: false });
-		this.add('API_Enable_Rate_Limiter_Limit_Time_Default', 60000, { type: 'int', public: false });
 		this.add('API_Allow_Infinite_Count', true, { type: 'boolean', public: false });
 		this.add('API_Enable_Direct_Message_History_EndPoint', false, { type: 'boolean', public: false });
 		this.add('API_Enable_Shields', true, { type: 'boolean', public: false });