From b1d1305b47ac2d65d1f348a7c28104d54e42a461 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Wed, 1 Aug 2018 21:53:23 -0300
Subject: [PATCH 1/6] [FIX] SAML login not working when user has multiple
 emails (#11642)

---
 packages/meteor-accounts-saml/saml_server.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js
index 9ffc945bff326..8e6dd13fdf957 100644
--- a/packages/meteor-accounts-saml/saml_server.js
+++ b/packages/meteor-accounts-saml/saml_server.js
@@ -103,8 +103,8 @@ Accounts.registerLoginHandler(function(loginRequest) {
 	}
 
 	if (loginResult && loginResult.profile && loginResult.profile.email) {
-		const email = RegExp.escape(loginResult.profile.email);
-		const emailRegex = new RegExp(`^${ email }$`, 'i');
+		const emailList = Array.isArray(loginResult.profile.email) ? loginResult.profile.email : [loginResult.profile.email];
+		const emailRegex = new RegExp(emailList.map(email => `^${ RegExp.escape(email) }$`).join('|'), 'i');
 		let user = Meteor.users.findOne({
 			'emails.address': emailRegex
 		});
@@ -114,10 +114,12 @@ Accounts.registerLoginHandler(function(loginRequest) {
 				name: loginResult.profile.cn || loginResult.profile.username,
 				active: true,
 				globalRoles: ['user'],
-				emails: [{
-					address: loginResult.profile.email,
-					verified: true
-				}]
+				emails: emailList.map(email => {
+					return {
+						address: email,
+						verified: true
+					};
+				})
 			};
 
 			if (Accounts.saml.settings.generateUsername === true) {

From 4b27388500dddfcb0cfd6bd38c0805c0b2b900bb Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 1 Aug 2018 17:19:18 -0300
Subject: [PATCH 2/6] [FIX] Prune translation on room info panel (#11635)

---
 .../client/views/channelSettings.html         |  8 ++---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  1 -
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 30 +++++++++----------
 packages/rocketchat-i18n/i18n/pt.i18n.json    | 20 ++++++-------
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 0dc561874950f..c8d13749a8382 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -362,15 +362,15 @@ <h3 title="{{name}}" class="rc-user-info__name">{{> icon block="rc-header__icon"
 						<div class="mail-messages__instructions-text">
 							{{#unless filesOnly}}
 								{{#unless excludePinned}}
-									{{_ "RetentionPolicy_RoomWarning" purgeTimeout}}
+									{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
 								{{else}}
-									{{_ "RetentionPolicy_RoomWarning_Unpinned" purgeTimeout}}
+									{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
 								{{/unless}}
 							{{else}}
 								{{#unless excludePinned}}
-									{{_ "RetentionPolicy_RoomWarning_FilesOnly" purgeTimeout}}
+									{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
 								{{else}}
-									{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" purgeTimeout}}
+									{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
 								{{/unless}}
 							{{/unless}}
 						</div>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ee390e7b83d2f..040f6613e9931 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1127,7 +1127,6 @@
   "File_name_Placeholder": "Search files...",
   "File_not_allowed_direct_messages": "File sharing not allowed in direct messages.",
   "File_removed_by_prune": "File removed by prune",
-  "File_removed_by_automatic_prune": "File removed by automatic prune",
   "File_type_is_not_accepted": "File type is not accepted.",
   "File_uploaded": "File uploaded",
   "FileUpload": "File Upload",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 62e0869b02255..e471c0af8e7f1 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -21,7 +21,6 @@
   "Accessing_permissions": "Acessando permissões",
   "Account_SID": "SID da Conta",
   "Accounts": "Contas",
-  "RetentionPolicy_RoomWarning": "lero __duration__ opa",
   "Accounts_Admin_Email_Approval_Needed_Default": "<p>O usuário <b>[nome] ([email])</b>foi registrado.</p><p>Verifique \"Administração ->Usuários\" para ativá-lo ou excluí-lo.</p>",
   "Accounts_Admin_Email_Approval_Needed_Subject_Default": "Um novo usuário se registrou e precisa de aprovação",
   "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>O usuário <b>[nome] ([email])</b>foi registrado.</p><p>Razão: <b>[razão]</b></p><p>Verifique \"Administração ->Usuários\" para ativá-lo ou excluí-lo.</p>",
@@ -1127,8 +1126,7 @@
   "File_exceeds_allowed_size_of_bytes": "O arquivo excede o tamanho permitido de __size__ bytes",
   "File_name_Placeholder": "Procurar arquivos...",
   "File_not_allowed_direct_messages": "Compartilhamento de arquivos não está permitido em mensagens diretas.",
-  "File_removed_by_prune": "Arquivo removido por ameixa seca",
-  "File_removed_by_automatic_prune": "Arquivo removido por remoção automática",
+  "File_removed_by_prune": "Arquivo removido por remoção automática",
   "File_type_is_not_accepted": "Tipo do arquivo não é aceito.",
   "File_uploaded": "Arquivo carregado",
   "FileUpload": "Upload de Arquivos",
@@ -2014,18 +2012,18 @@
   "Profile_details": "Detalhes de perfil",
   "Profile_picture": "Foto do perfil",
   "Profile_saved_successfully": "Perfil salvo com sucesso",
-  "Prune": "Ameixa seca",
-  "Prune_finished": "Ameixa terminada",
-  "Prune_Messages": "Mensagens de poda",
+  "Prune": "Remoção em massa",
+  "Prune_finished": "Remoção terminada",
+  "Prune_Messages": "Remoção de Mensagens",
   "Prune_Modal": "Tem certeza de que deseja remover essas mensagens? As mensagens limpas não podem ser recuperadas.",
-  "Prune_Warning_all": "Isso excluirá todos os% s em% s!",
-  "Prune_Warning_before": "Isso excluirá todos os% s em% s antes de% s.",
-  "Prune_Warning_after": "Isso excluirá todos os% s em% s depois de% s.",
-  "Prune_Warning_between": "Isso excluirá todos os% s em% s entre% s e% s.",
-  "Pruning_messages": "Podando mensagens ...",
+  "Prune_Warning_all": "Isso excluirá todos os %s em %s!",
+  "Prune_Warning_before": "Isso excluirá todos os %s em %s antes de %s.",
+  "Prune_Warning_after": "Isso excluirá todos os %s em %s depois de %s.",
+  "Prune_Warning_between": "Isso excluirá todos os %s em %s entre %s e %s.",
+  "Pruning_messages": "Removendo mensagens ...",
   "Pruning_files": "Removendo arquivos ...",
-  "messages_pruned": "mensagens podadas",
-  "files_pruned": "arquivos podados",
+  "messages_pruned": "mensagens removidas",
+  "files_pruned": "arquivos removidos",
   "Public": "Público",
   "Public_Channel": "Canal público",
   "Public_Community": "Comunidade",
@@ -2144,12 +2142,12 @@
   "RetentionPolicy_MaxAge_Channels": "A idade máxima da mensagem nos canais",
   "RetentionPolicy_MaxAge_Groups": "Duração máxima da mensagem em grupos privados",
   "RetentionPolicy_MaxAge_DMs": "Duração máxima da mensagem em mensagens diretas",
-  "RetentionPolicy_MaxAge_Description": "Podar todas as mensagens mais antigas que esse valor, em dias",
+  "RetentionPolicy_MaxAge_Description": "Remover todas as mensagens mais antigas que esse valor, em dias",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar isso para um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem custar um poder de processamento extra em grandes comunidades.",
   "RetentionPolicyRoom_Enabled": "Remover automaticamente mensagens antigas",
   "RetentionPolicyRoom_ExcludePinned": "Excluir mensagens fixas",
-  "RetentionPolicyRoom_FilesOnly": "Apenas arquivos de poda, mantenha mensagens",
+  "RetentionPolicyRoom_FilesOnly": "Remover apenas arquivos, mantenha mensagens",
   "RetentionPolicyRoom_MaxAge": "Idade máxima da mensagem em dias (padrão: __max__)",
   "RetentionPolicyRoom_OverrideGlobal": "Substituir política de retenção global",
   "RetentionPolicyRoom_ReadTheDocs": "Cuidado! Ajustar essas configurações sem o maior cuidado pode destruir todo o histórico de mensagens. Leia a documentação antes de ativar o recurso em <a href = 'https: //rocket.chat/docs/administrator-guides/retention-policies/'>aqui</a>.",
@@ -2781,7 +2779,7 @@
   "Yes_hide_it": "Sim, esconder!",
   "Yes_leave_it": "Sim, sair!",
   "Yes_mute_user": "Sim, silenciar usuário!",
-  "Yes_prune_them": "Sim, poda-os!",
+  "Yes_prune_them": "Sim, remova-os!",
   "Yes_remove_user": "Sim, remover usuário!",
   "Yes_unarchive_it": "Sim, desquite!",
   "yesterday": "ontem",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 38735451606ec..93cf8ee495bf6 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -1126,7 +1126,7 @@
   "File_exceeds_allowed_size_of_bytes": "O arquivo excede o tamanho permitido de __size__ bytes",
   "File_name_Placeholder": "Procurar arquivos...",
   "File_not_allowed_direct_messages": "O compartilhamento de arquivos não é permitido em mensagens diretas.",
-  "File_removed_by_prune": "Arquivo removido por ameixa seca",
+  "File_removed_by_prune": "Arquivo removido por remoção automática",
   "File_removed_by_automatic_prune": "Arquivo removido por remoção automática",
   "File_type_is_not_accepted": "O tipo de arquivo não é aceito.",
   "File_uploaded": "Arquivo carregado",
@@ -2013,18 +2013,18 @@
   "Profile_details": "Detalhes de perfil",
   "Profile_picture": "Foto do perfil",
   "Profile_saved_successfully": "Perfil salvo com sucesso",
-  "Prune": "Ameixa seca",
-  "Prune_finished": "Ameixa terminada",
-  "Prune_Messages": "Mensagens de poda",
+  "Prune": "Remoção em massa",
+  "Prune_finished": "Remoção terminada",
+  "Prune_Messages": "Remoção de Mensagens",
   "Prune_Modal": "Tem certeza de que deseja remover essas mensagens? As mensagens limpas não podem ser recuperadas.",
   "Prune_Warning_all": "Isto irá apagar todos os %s em %s!",
   "Prune_Warning_before": "Isto irá apagar todos os %s em %s antes de %s.",
   "Prune_Warning_after": "Isto irá apagar todos os %s em %s depois de %s.",
   "Prune_Warning_between": "Isto irá apagar todos os %s em %s entre %s e %s.",
-  "Pruning_messages": "Podando mensagens ...",
+  "Pruning_messages": "Removendo mensagens ...",
   "Pruning_files": "Removendo arquivos ...",
-  "messages_pruned": "mensagens podadas",
-  "files_pruned": "arquivos podados",
+  "messages_pruned": "mensagens removidas",
+  "files_pruned": "arquivos removidos",
   "Public": "Público",
   "Public_Channel": "Canal público",
   "Public_Community": "Comunidade",
@@ -2143,12 +2143,12 @@
   "RetentionPolicy_MaxAge_Channels": "A idade máxima da mensagem nos canais",
   "RetentionPolicy_MaxAge_Groups": "Duração máxima da mensagem em grupos privados",
   "RetentionPolicy_MaxAge_DMs": "Duração máxima da mensagem em mensagens diretas",
-  "RetentionPolicy_MaxAge_Description": "Podar todas as mensagens mais antigas que esse valor, em dias",
+  "RetentionPolicy_MaxAge_Description": "Remover todas as mensagens mais antigas que esse valor, em dias",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar isso para um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem custar um poder de processamento extra em grandes comunidades.",
   "RetentionPolicyRoom_Enabled": "Remover automaticamente mensagens antigas",
   "RetentionPolicyRoom_ExcludePinned": "Excluir mensagens fixas",
-  "RetentionPolicyRoom_FilesOnly": "Apenas arquivos de poda, mantenha mensagens",
+  "RetentionPolicyRoom_FilesOnly": "Remover apenas arquivos, mantenha mensagens",
   "RetentionPolicyRoom_MaxAge": "Idade máxima da mensagem em dias (padrão: __max__)",
   "RetentionPolicyRoom_OverrideGlobal": "Substituir política de retenção global",
   "RetentionPolicyRoom_ReadTheDocs": "Cuidado! Ajustar estas configurações sem as devidas precauções, pode resultar na destruição de todo o histórico de mensagens. Leia a documentação antes de activar o recurso <a href=\"https://rocket.chat/docs/administrator-guides/retention-policies/\">aqui</a>.",
@@ -2780,7 +2780,7 @@
   "Yes_hide_it": "Sim, esconda!",
   "Yes_leave_it": "Sim, sair!",
   "Yes_mute_user": "Sim, silenciar o utilizador!",
-  "Yes_prune_them": "Sim, poda-os!",
+  "Yes_prune_them": "Sim, remova-os!",
   "Yes_remove_user": "Sim, remover utilizador!",
   "Yes_unarchive_it": "Sim, desarquive!",
   "yesterday": "ontem",

From e3b4461b7a7bce366b0723952af4dd2206064a7f Mon Sep 17 00:00:00 2001
From: Sebastian Gumprich <rndmh3ro@users.noreply.github.com>
Date: Wed, 1 Aug 2018 21:10:22 +0200
Subject: [PATCH 3/6] [FIX] Prune translations in German (#11631)

---
 packages/rocketchat-i18n/i18n/de-AT.i18n.json | 6 +++---
 packages/rocketchat-i18n/i18n/de.i18n.json    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 00ecfa9b0fe5e..e8ca4d254da12 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -1126,7 +1126,7 @@
   "File_exceeds_allowed_size_of_bytes": "Die Datei ist größer als das erlaubte Maximum von __size__ Bytes",
   "File_name_Placeholder": "Dateien suchen...",
   "File_not_allowed_direct_messages": "Dateifreigabe in direkten Nachrichten nicht erlaubt.",
-  "File_removed_by_prune": "Die Datei wurde mit der Prune entfernt",
+  "File_removed_by_prune": "Die Datei wurde entfernt",
   "File_removed_by_automatic_prune": "Datei wurde durch automatische Bereinigung entfernt",
   "File_type_is_not_accepted": "Feldtyp nicht akzeptiert.",
   "File_uploaded": "Datei hochgeladen",
@@ -2013,8 +2013,8 @@
   "Profile_details": "Profildetails",
   "Profile_picture": "Profilbild",
   "Profile_saved_successfully": "Das Profil wurde erfolgreich gespeichert",
-  "Prune": "Pflaume",
-  "Prune_finished": "Prune beendet",
+  "Prune": "Löschen",
+  "Prune_finished": "Löschen beendet",
   "Prune_Messages": "Nachrichten löschen",
   "Prune_Modal": "Möchten Sie diese Nachrichten wirklich löschen? Bereinigte Nachrichten können nicht wiederhergestellt werden.",
   "Prune_Warning_all": "Dadurch werden alle% s in% s gelöscht!",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 1ad9788c90a41..196784f331d46 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -1126,7 +1126,7 @@
   "File_exceeds_allowed_size_of_bytes": "Die Datei ist größer als das erlaubte Maximum von __size__ Bytes",
   "File_name_Placeholder": "Dateien suchen...",
   "File_not_allowed_direct_messages": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
-  "File_removed_by_prune": "Die Datei wurde mit der Prune entfernt",
+  "File_removed_by_prune": "Die Datei wurde entfernt",
   "File_removed_by_automatic_prune": "Datei wurde durch automatische Bereinigung entfernt",
   "File_type_is_not_accepted": "Dateityp wir nicht akzeptiert.",
   "File_uploaded": "Datei hochgeladen",
@@ -2013,8 +2013,8 @@
   "Profile_details": "Profildetails",
   "Profile_picture": "Profilbild",
   "Profile_saved_successfully": "Das Profil wurde erfolgreich gespeichert",
-  "Prune": "Pflaume",
-  "Prune_finished": "Prune beendet",
+  "Prune": "Löschen",
+  "Prune_finished": "Löschen beendet",
   "Prune_Messages": "Nachrichten löschen",
   "Prune_Modal": "Möchten Sie diese Nachrichten wirklich löschen? Bereinigte Nachrichten können nicht wiederhergestellt werden.",
   "Prune_Warning_all": "Dadurch werden alle% s in% s gelöscht!",

From b94badc268e2509286071a53db02765a748b0157 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Wed, 1 Aug 2018 15:34:04 -0300
Subject: [PATCH 4/6] [FIX] User info APIs not returning customFields correctly
 (#11625)

---
 .../server/functions/getFullUserData.js             | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/rocketchat-lib/server/functions/getFullUserData.js b/packages/rocketchat-lib/server/functions/getFullUserData.js
index 6b73befb42f12..5b306045851d4 100644
--- a/packages/rocketchat-lib/server/functions/getFullUserData.js
+++ b/packages/rocketchat-lib/server/functions/getFullUserData.js
@@ -37,9 +37,9 @@ RocketChat.settings.get('Accounts_CustomFields', (key, value) => {
 	}
 
 	try {
-		const customFields = JSON.parse(value.trim());
-		Object.keys(customFields).forEach(key => {
-			const element = customFields[key];
+		const customFieldsOnServer = JSON.parse(value.trim());
+		Object.keys(customFieldsOnServer).forEach(key => {
+			const element = customFieldsOnServer[key];
 			if (element.public) {
 				publicCustomFields[`customFields.${ key }`] = 1;
 			}
@@ -48,21 +48,20 @@ RocketChat.settings.get('Accounts_CustomFields', (key, value) => {
 	} catch (e) {
 		logger.warn(`The JSON specified for "Accounts_CustomFields" is invalid. The following error was thrown: ${ e }`);
 	}
-
 });
 
 RocketChat.getFullUserData = function({ userId, filter, limit: l }) {
 	const username = s.trim(filter);
-
+	const userToRetrieveFullUserData = RocketChat.models.Users.findOneByUsername(username);
+	const isMyOwnInfo = userToRetrieveFullUserData && userToRetrieveFullUserData._id === userId;
 	const viewFullOtherUserInfo = RocketChat.authz.hasPermission(userId, 'view-full-other-user-info');
-
 	const limit = !viewFullOtherUserInfo ? 1 : l;
 
 	if (!username && limit <= 1) {
 		return undefined;
 	}
 
-	const _customFields = viewFullOtherUserInfo ? customFields : publicCustomFields;
+	const _customFields = isMyOwnInfo || viewFullOtherUserInfo ? customFields : publicCustomFields;
 
 	const fields = viewFullOtherUserInfo ? { ...defaultFields, ...fullFields, ..._customFields } : { ...defaultFields, ..._customFields };
 

From 730022e3dc6d4725243b75340c9f772278ff0fe9 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Wed, 1 Aug 2018 14:13:31 -0300
Subject: [PATCH 5/6] [FIX] Missing chat history for users without permission
 `preview-c-room` (#11639)

---
 server/methods/loadHistory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js
index cd7c0cde20f95..b82af9957e372 100644
--- a/server/methods/loadHistory.js
+++ b/server/methods/loadHistory.js
@@ -38,7 +38,7 @@ Meteor.methods({
 		const canAnonymous = RocketChat.settings.get('Accounts_AllowAnonymousRead');
 		const canPreview = RocketChat.authz.hasPermission(fromId, 'preview-c-room');
 
-		if (room.t === 'c' && !canAnonymous && !canPreview && RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, fromId, { fields: { _id: 1 } })) {
+		if (room.t === 'c' && !canAnonymous && !canPreview && !RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, fromId, { fields: { _id: 1 } })) {
 			return false;
 		}
 

From 6f8f90f19c0b833521bf2da34a961f8b8c83f8e1 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 1 Aug 2018 21:57:45 -0300
Subject: [PATCH 6/6] Bump version to 0.68.3

---
 .docker/Dockerfile.rhel                 |  2 +-
 .github/history.json                    | 58 +++++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |  4 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 25 +++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 2a24ba9422f18..85a9c1aff3cc7 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 0.68.2
+ENV RC_VERSION 0.68.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 23aad4a9788d4..44be188f31ce4 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -17692,6 +17692,64 @@
           ]
         }
       ]
+    },
+    "0.68.3": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11639",
+          "title": "[FIX] Missing chat history for users without permission `preview-c-room`",
+          "userLogin": "Hudell",
+          "milestone": "0.68.3",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "11625",
+          "title": "[FIX] User info APIs not returning customFields correctly",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.68.3",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11631",
+          "title": "[FIX] Prune translations in German",
+          "userLogin": "rndmh3ro",
+          "milestone": "0.68.3",
+          "contributors": [
+            "rndmh3ro",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11635",
+          "title": "[FIX] Prune translation on room info panel",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.68.3",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11642",
+          "title": "[FIX] SAML login not working when user has multiple emails",
+          "userLogin": "Hudell",
+          "milestone": "0.68.3",
+          "contributors": [
+            "Hudell",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 292bd11d36f82..dfcd51b9424f3 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 91,  # Increment this for every release.
+		appVersion = 92,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.68.2"),
+		appMarketingVersion = (defaultText = "0.68.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index daa4657570d32..ecde2be6ae704 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=0.68.2
+    RC_VERSION=0.68.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 7601b5c5473e9..816eee190645a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,29 @@
 
+# 0.68.3
+`2018-08-01  ·  5 🐛  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- Missing chat history for users without permission `preview-c-room` ([#11639](https://github.com/RocketChat/Rocket.Chat/pull/11639))
+- User info APIs not returning customFields correctly ([#11625](https://github.com/RocketChat/Rocket.Chat/pull/11625))
+- Prune translations in German ([#11631](https://github.com/RocketChat/Rocket.Chat/pull/11631) by [@rndmh3ro](https://github.com/rndmh3ro))
+- Prune translation on room info panel ([#11635](https://github.com/RocketChat/Rocket.Chat/pull/11635))
+- SAML login not working when user has multiple emails ([#11642](https://github.com/RocketChat/Rocket.Chat/pull/11642))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@rndmh3ro](https://github.com/rndmh3ro)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.68.2
 `2018-07-31  ·  1 🐛  ·  2 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index a00d17ba19e48..99d6972e95cdc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.68.2",
+	"version": "0.68.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index cd1583102729a..45ac451ad4ad3 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.68.2"
+	"version": "0.68.3"
 }