Merge beta into master

.circleci/config.yml

@@ -75,29 +75,6 @@ restore_cache: &restore-gradle-cache
   name: Restore gradle cache
   key: android-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
 
-restore-brew-cache: &restore-brew-cache
-  name: Restore Brew cache
-  key: brew-{{ checksum "yarn.lock" }}-{{ checksum ".circleci/config.yml" }}
-
-save-brew-cache: &save-brew-cache
-  name: Save brew cache
-  key: brew-{{ checksum "yarn.lock" }}-{{ checksum ".circleci/config.yml" }}
-  paths:
-    - /usr/local/Homebrew
-
-install-apple-sim-utils: &install-apple-sim-utils
-  name: Install appleSimUtils
-  command: |
-    brew update
-    brew tap wix/brew
-    brew install wix/brew/applesimutils
-
-rebuild-detox: &rebuild-detox
-  name: Rebuild Detox framework cache
-  command: |
-    npx detox clean-framework-cache
-    npx detox build-framework-cache
-
 version: 2.1
 
 # EXECUTORS
@@ -107,35 +84,6 @@ executors:
     environment:
       <<: *bash-env
 
-# COMMANDS
-commands:
-  detox-test:
-    parameters:
-      folder:
-        type: string
-    steps:
-      - checkout
-
-      - attach_workspace:
-          at: .
-
-      - restore_cache: *restore-npm-cache-mac
-
-      - restore_cache: *restore-brew-cache
-
-      - run: *install-node
-
-      - run: *install-apple-sim-utils
-
-      - run: *install-npm-modules
-
-      - run: *rebuild-detox
-
-      - run:
-          name: Test
-          command: |
-            npx detox test << parameters.folder >> --configuration ios.sim.release --cleanup
-
 # JOBS
 jobs:
   lint-testunit:
@@ -170,57 +118,6 @@ jobs:
 
       - save_cache: *save-npm-cache-linux
 
-  # E2E
-  e2e-build:
-    executor: mac-env
-
-    steps:
-      - checkout
-
-      - restore_cache: *restore-npm-cache-mac
-
-      - restore_cache: *restore-brew-cache
-
-      - run: *install-node
-
-      - run: *install-apple-sim-utils
-
-      - run: *install-npm-modules
-
-      - run: *rebuild-detox
-
-      - run:
-          name: Build
-          command: |
-            npx detox build --configuration ios.sim.release
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
-
-      - save_cache: *save-npm-cache-mac
-
-      - save_cache: *save-brew-cache
-
-  e2e-test-onboarding:
-    executor: mac-env
-    steps:
-      - detox-test:
-          folder: "./e2e/tests/onboarding"
-
-  e2e-test-room:
-    executor: mac-env
-    steps:
-      - detox-test:
-          folder: "./e2e/tests/room"
-
-  e2e-test-assorted:
-    executor: mac-env
-    steps:
-      - detox-test:
-          folder: "./e2e/tests/assorted"
-
   # Android builds
   android-build:
     <<: *defaults
@@ -429,23 +326,6 @@ workflows:
     jobs:
       - lint-testunit
 
-      - e2e-hold:
-          type: approval
-          requires:
-            - lint-testunit
-      - e2e-build:
-          requires:
-            - e2e-hold
-      - e2e-test-onboarding:
-          requires:
-            - e2e-build
-      - e2e-test-room:
-          requires:
-            - e2e-build
-      - e2e-test-assorted:
-          requires:
-            - e2e-build
-
       - ios-build:
           requires:
             - lint-testunit

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,34 @@
-<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
-@RocketChat/ReactNative
+<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
 
-<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
-Closes #ISSUE_NUMBER
+## Proposed changes
+<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue below. -->
 
-<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
+## Issue(s)	
+<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
+
+## How to test or reproduce
+<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
+
+## Screenshots
+
+## Types of changes
+<!-- What types of changes does your code introduce to Rocket.Chat? -->
+<!-- Put an `x` in the boxes that apply -->
+
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] Improvement (non-breaking change which improves a current function)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Documentation update (if none of the other choices apply)
+
+## Checklist
+<!-- Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. -->
+
+- [ ] I have read the [CONTRIBUTING](https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat) doc
+- [ ] I have signed the [CLA](https://cla-assistant.io/RocketChat/Rocket.Chat.ReactNative)
+- [ ] Lint and unit tests pass locally with my changes
+- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
+- [ ] I have added necessary documentation (if applicable)
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+## Further comments
+<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->