From 80341ed12fbcd59b7d25b410467ae11a1c8b7c4e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 30 May 2019 08:41:49 -0300
Subject: [PATCH] Bump version to 1.1.1

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 39 +++++++++++++++++++++++++++++++++++++++
 .travis/snap.sh           |  2 +-
 HISTORY.md                | 26 ++++++++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 6 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index a750c7beef7e..9d185e6608c2 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 1.1.0
+ENV RC_VERSION 1.1.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 0b2735654d9c..4dfe81f5022b 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -31802,6 +31802,45 @@
           ]
         }
       ]
+    },
+    "1.1.1": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "14686",
+          "title": "[FIX] SAML login error.",
+          "userLogin": "Hudell",
+          "milestone": "1.1.1",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "14668",
+          "title": "[FIX] Load messages after disconnect and message box scroll missing",
+          "userLogin": "ggazzo",
+          "milestone": "1.1.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "14674",
+          "title": "Removing unnecesary federation configs",
+          "userLogin": "alansikora",
+          "milestone": "1.1.1",
+          "contributors": [
+            "alansikora"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.travis/snap.sh b/.travis/snap.sh
index fcb998faa2e9..96277f38c676 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=1.1.0
+    RC_VERSION=1.1.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 255ad9ac2bf9..68c7b201f8e7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,30 @@
 
+# 1.1.1
+`2019-05-30  ·  2 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- SAML login error. ([#14686](https://github.com/RocketChat/Rocket.Chat/pull/14686))
+- Load messages after disconnect and message box scroll missing ([#14668](https://github.com/RocketChat/Rocket.Chat/pull/14668))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Removing unnecesary federation configs ([#14674](https://github.com/RocketChat/Rocket.Chat/pull/14674))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@alansikora](https://github.com/alansikora)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.1.0
 `2019-05-27  ·  5 🎉  ·  10 🚀  ·  52 🐛  ·  35 🔍  ·  27 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 4f228d2b49b6..41621c16db81 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "1.1.0"
+	"version": "1.1.1"
 }
diff --git a/package.json b/package.json
index 51a9d81be7b8..6a7382cc05e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"