Merge branch 'develop' into single-server-4.18.0

# Conflicts:
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	app/actions/actionsTypes.js
#	app/actions/permissions.js
#	app/constants/settings.js
#	app/containers/markdown/Link.js
#	app/i18n/locales/ar.json
#	app/i18n/locales/de.json
#	app/i18n/locales/en.json
#	app/i18n/locales/es-ES.json
#	app/i18n/locales/fr.json
#	app/i18n/locales/it.json
#	app/i18n/locales/ja.json
#	app/i18n/locales/nl.json
#	app/i18n/locales/pt-BR.json
#	app/i18n/locales/pt-PT.json
#	app/i18n/locales/ru.json
#	app/i18n/locales/tr.json
#	app/i18n/locales/zh-CN.json
#	app/i18n/locales/zh-TW.json
#	app/lib/methods/getPermissions.js
#	app/lib/methods/getRoles.js
#	app/lib/rocketchat.js
#	app/reducers/index.js
#	app/reducers/permissions.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/sagas/selectServer.js
#	app/utils/log/events.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomView/List/NavBottomFAB.js
#	app/views/RoomView/List/index.js
#	app/views/RoomsListView/Header/Header.js
#	app/views/RoomsListView/index.js
#	e2e/data.js
#	e2e/data/data.cloud.js
#	e2e/data/data.docker.js
#	e2e/helpers/app.js
#	e2e/helpers/data_setup.js
#	e2e/tests/assorted/01-e2eencryption.spec.js
#	e2e/tests/assorted/03-profile.spec.js
#	e2e/tests/assorted/04-setting.spec.js
#	e2e/tests/assorted/06-status.spec.js
#	e2e/tests/assorted/07-changeserver.spec.js
#	e2e/tests/assorted/09-joinfromdirectory.spec.js
#	e2e/tests/assorted/10-deleteserver.spec.js
#	e2e/tests/assorted/11-deeplinking.spec.js
#	e2e/tests/assorted/12-i18n.spec.js
#	e2e/tests/onboarding/01-onboarding.spec.js
#	e2e/tests/room/01-createroom.spec.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	e2e/tests/room/04-discussion.spec.js
#	e2e/tests/room/05-threads.spec.js
#	e2e/tests/room/06-createdmgroup.spec.js
#	e2e/tests/room/07-markasunread.spec.js
#	e2e/tests/team/01-createteam.spec.js
#	e2e/tests/team/02-team.spec.js
#	e2e/tests/team/03-moveconvert.spec.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json

.eslintignore

@@ -1,6 +1,6 @@
 __tests__
 node_modules
 coverage
-e2e
+e2e/docker
 android
 ios

.eslintrc.js

@@ -29,7 +29,8 @@ module.exports = {
 		"commonjs": true,
 		"es6": true,
 		"node": true,
-		"jquery": true
+		"jquery": true,
+		"mocha": true
 	},
 	"rules": {
 		"react/jsx-filename-extension": [1, {
@@ -155,5 +156,23 @@ module.exports = {
 	},
 	"globals": {
 		"__DEV__": true
-	}
+	},
+	overrides: [
+		{
+			files: ['e2e/**'],
+			globals: {
+				by: true,
+				detox: true,
+				device: true,
+				element: true,
+				expect: true,
+				waitFor: true
+			},
+			rules: {
+				'import/no-extraneous-dependencies': 0,
+				'no-await-in-loop': 0,
+				'no-restricted-syntax': 0
+			}
+		}
+	]
 };