diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 486da5bb90..882ae337c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,27 +130,6 @@ variables:
   REGISTRY_HOST: "registry.gitlab.com"
   REGISTRY_GROUP: "gitlab-org"
 
-  # Preparing custom clone path to reduce space used by all random forks
-  # on GitLab.com's Shared Runners. Our main forks - especially the security
-  # ones - will have this variable overwritten in the project settings, so that
-  # a security-related code or code using our protected variables will be never
-  # stored on the same path as the community forks.
-  # Part of the solution for the `no space left on device` problem described at
-  # https://gitlab.com/gitlab-org/gitlab/issues/197876.
-  #
-  # For this purpose the https://gitlab.com/gitlab-org-forks group was created
-  # to host a placeholder for the `/builds/gitlab-org-forks` path and ensure
-  # that no legitimate project will ever use it and - by mistake - execute its
-  # job on a shared working directory. It also requires proper configuration of
-  # the Runner that executes the job (which was prepared for our shared runners
-  # by https://ops.gitlab.net/gitlab-cookbooks/chef-repo/-/merge_requests/3977).
-  #
-  # Because of all of that PLEASE DO NOT CHANGE THE PATH.
-  #
-  # For more details and reasoning that brought this change please check
-  # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24887
-  GIT_CLONE_PATH: "/builds/gitlab-org-forks/${CI_PROJECT_NAME}"
-
 include:
   - local: .gitlab/ci/*.gitlab-ci.yml
   - remote: 'https://gitlab.com/gitlab-org/frontend/untamper-my-lockfile/-/raw/main/templates/merge_request_pipelines.yml'
diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index 2330683cc1..32ea84fbfc 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -263,6 +263,7 @@ Style/StringConcatenation:
     - 'spec/models/custom_emoji_spec.rb'
     - 'spec/models/grafana_integration_spec.rb'
     - 'spec/models/integrations/campfire_spec.rb'
+    - 'spec/models/integrations/datadog_spec.rb'
     - 'spec/models/integrations/chat_message/pipeline_message_spec.rb'
     - 'spec/models/integrations/chat_message/push_message_spec.rb'
     - 'spec/models/integrations/jenkins_spec.rb'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9b2d11964..0d59a3e7e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,36 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 15.3.4 (2022-09-29)
+
+### Security (15 changes)
+
+- [Redact user's private email in group member event webhook](gitlab-org/security/gitlab@172b8a57bd4acca14d65a4b7a5fd021babacb146) ([merge request](gitlab-org/security/gitlab!2794))
+- [Redact secrets from WebHookLogs](gitlab-org/security/gitlab@7394ab9b32a7bd83b98f93e904312e469f34cd9c) ([merge request](gitlab-org/security/gitlab!2737))
+- [Forbid creating a tag using default branch name](gitlab-org/security/gitlab@1b556c33aa11c32994be562cfea0ff2e5e13a54e) ([merge request](gitlab-org/security/gitlab!2799))
+- [Sanitize Url and check for valid numerical errorId in error tracking](gitlab-org/security/gitlab@2a5a51b5b2839963fe7084261c8a7fcc6f09f19c) ([merge request](gitlab-org/security/gitlab!2785))
+- [Add security protection for Github](gitlab-org/security/gitlab@bc23f46dba26bcdf0c773c24081e4ae3597bf751) ([merge request](gitlab-org/security/gitlab!2802))
+- [Fix leaking emails in WebHookLogs](gitlab-org/security/gitlab@a31a652c331877e0f97269310ec5f1bc6266398f) ([merge request](gitlab-org/security/gitlab!2807))
+- [Restrict max duration to 1 year for trace display](gitlab-org/security/gitlab@b62fd774b6f311988c7e10f3544f2aeabeab85d1) ([merge request](gitlab-org/security/gitlab!2815))
+- [Use UntrustedRegexp for upload rewriter](gitlab-org/security/gitlab@2eea36acbc5687aa9806946861e73f2fb11a9654) ([merge request](gitlab-org/security/gitlab!2791))
+- [Validate httpUrlToRepo to be http or https only](gitlab-org/security/gitlab@0b340ef6d6e54804445916f5b1fa53185de4b1f7) ([merge request](gitlab-org/security/gitlab!2760))
+- [Respect instance level rule for editing approval rules](gitlab-org/security/gitlab@2d2a7b8652dbd1085fe1bfc0b69138aecdeaf9c8) ([merge request](gitlab-org/security/gitlab!2782))
+- [Prevent users creating issues in ay project via board/issues controller](gitlab-org/security/gitlab@559b23e6942a650cafa358ea96b7ee549f76fbd6) ([merge request](gitlab-org/security/gitlab!2780))
+- [Prevent serialization of sensible attributes from JsonCache](gitlab-org/security/gitlab@f712d58af3aeb3f0fe1c56a290188e19fce72ad6) ([merge request](gitlab-org/security/gitlab!2771))
+- [Update TodoPolicy to handle confidential notes](gitlab-org/security/gitlab@6bd37cd0595bbf4c744a5b212fc41181c9dc88ef) ([merge request](gitlab-org/security/gitlab!2748))
+- [Enforce group IP restriction on Dependency Proxy](gitlab-org/security/gitlab@cc42b5e91e04e77ade63f1fdb91e88b998c156f7) ([merge request](gitlab-org/security/gitlab!2764))
+- [Fixes XSS in widget extensions](gitlab-org/security/gitlab@1d10849c7eee6207435bfd223e1f8639b2816c1e) ([merge request](gitlab-org/security/gitlab!2759))
+
+## 15.3.3 (2022-09-01)
+
+### Fixed (5 changes)
+
+- [Skip file removal if GitLab managed replication is disabled](gitlab-org/gitlab@dbec61270621df70775c98946d09deca913bd187) ([merge request](gitlab-org/gitlab!96556)) **GitLab Enterprise Edition**
+- [Geo: Fix redirects of LFS transfer downloads](gitlab-org/gitlab@98092958c879d1dc9dda0ba2953ba548aa0b93c0) ([merge request](gitlab-org/gitlab!96654)) **GitLab Enterprise Edition**
+- [Improve blame link feature](gitlab-org/gitlab@163cadb49f96951a0f747d61a8cd1cb92b7d4296) ([merge request](gitlab-org/gitlab!96654))
+- [Bypass earliest date validation in importing of iteration cadences](gitlab-org/gitlab@66f56eb2551a302d80ca0891ff0bddec1c84f025) ([merge request](gitlab-org/gitlab!96654)) **GitLab Enterprise Edition**
+- [Fix user recent activity links for work item actions](gitlab-org/gitlab@9d9368545847cf558fad26a64b216a00b2db36b4) ([merge request](gitlab-org/gitlab!96654))
+
 ## 15.3.2 (2022-08-30)
 
 ### Security (17 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 7bb26bde92..3cad8b789c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-15.3.2
\ No newline at end of file
+15.3.4
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 7bb26bde92..3cad8b789c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.2
\ No newline at end of file
+15.3.4
\ No newline at end of file
diff --git a/app/assets/javascripts/batch_comments/components/review_bar.vue b/app/assets/javascripts/batch_comments/components/review_bar.vue
index 111b670596..3cd1a2525e 100644
--- a/app/assets/javascripts/batch_comments/components/review_bar.vue
+++ b/app/assets/javascripts/batch_comments/components/review_bar.vue
@@ -2,20 +2,10 @@
 import { mapActions, mapGetters } from 'vuex';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { REVIEW_BAR_VISIBLE_CLASS_NAME } from '../constants';
-import { PREVENT_LEAVING_PENDING_REVIEW } from '../i18n';
 import PreviewDropdown from './preview_dropdown.vue';
 import PublishButton from './publish_button.vue';
 import SubmitDropdown from './submit_dropdown.vue';
 
-function closeInterrupt(event) {
-  event.preventDefault();
-
-  // This is the correct way to write backwards-compatible beforeunload listeners
-  // https://developer.chrome.com/blog/page-lifecycle-api/#the-beforeunload-event
-  /* eslint-disable-next-line no-return-assign, no-param-reassign */
-  return (event.returnValue = PREVENT_LEAVING_PENDING_REVIEW);
-}
-
 export default {
   components: {
     PreviewDropdown,
@@ -35,26 +25,8 @@ export default {
   },
   mounted() {
     document.body.classList.add(REVIEW_BAR_VISIBLE_CLASS_NAME);
-    /*
-     * This stuff is a lot trickier than it looks.
-     *
-     * Mandatory reading: https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event
-     * Some notable sentences:
-     *     - "[...] browsers may not display prompts created in beforeunload event handlers unless the
-     *         page has been interacted with, or may even not display them at all."
-     *     - "Especially on mobile, the beforeunload event is not reliably fired."
-     *     - "The beforeunload event is not compatible with the back/forward cache (bfcache) [...]
-     *         It is recommended that developers listen for beforeunload only in this scenario, and only
-     *         when they actually have unsaved changes, so as to minimize the effect on performance."
-     *
-     * Please ensure that this is really not working before you modify it, because there are a LOT
-     * of scenarios where browser behavior will make it _seem_ like it's not working, but it actually
-     * is under the right combination of contexts.
-     */
-    window.addEventListener('beforeunload', closeInterrupt, { capture: true });
   },
   beforeDestroy() {
-    window.removeEventListener('beforeunload', closeInterrupt, { capture: true });
     document.body.classList.remove(REVIEW_BAR_VISIBLE_CLASS_NAME);
   },
   methods: {
diff --git a/app/assets/javascripts/batch_comments/i18n.js b/app/assets/javascripts/batch_comments/i18n.js
deleted file mode 100644
index 6cdbf00f9c..0000000000
--- a/app/assets/javascripts/batch_comments/i18n.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { __ } from '~/locale';
-
-export const PREVENT_LEAVING_PENDING_REVIEW = __('There are unsubmitted review comments.');
diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
index 863d2a9997..a44b9827fe 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
@@ -1,12 +1,9 @@
 import { isEmpty } from 'lodash';
-
 import createFlash from '~/flash';
 import { scrollToElement } from '~/lib/utils/common_utils';
 import { __ } from '~/locale';
-
 import { CHANGES_TAB, DISCUSSION_TAB, SHOW_TAB } from '../../../constants';
 import service from '../../../services/drafts_service';
-
 import * as types from './mutation_types';
 
 export const saveDraft = ({ dispatch }, draft) =>
@@ -18,7 +15,6 @@ export const addDraftToDiscussion = ({ commit }, { endpoint, data }) =>
     .then((res) => res.data)
     .then((res) => {
       commit(types.ADD_NEW_DRAFT, res);
-
       return res;
     })
     .catch(() => {
@@ -33,7 +29,6 @@ export const createNewDraft = ({ commit }, { endpoint, data }) =>
     .then((res) => res.data)
     .then((res) => {
       commit(types.ADD_NEW_DRAFT, res);
-
       return res;
     })
     .catch(() => {
diff --git a/app/assets/javascripts/blob/blob_blame_link.js b/app/assets/javascripts/blob/blob_blame_link.js
new file mode 100644
index 0000000000..41dfd7b82b
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_blame_link.js
@@ -0,0 +1,31 @@
+function addBlameLink(containerSelector, linkClass) {
+  const containerEl = document.querySelector(containerSelector);
+
+  if (!containerEl) {
+    return;
+  }
+
+  containerEl.addEventListener('mouseover', (e) => {
+    const isLineLink = e.target.classList.contains(linkClass);
+    if (isLineLink) {
+      const lineLink = e.target;
+      const lineLinkCopy = lineLink.cloneNode(true);
+      lineLinkCopy.classList.remove(linkClass, 'diff-line-num');
+
+      const { lineNumber } = lineLink.dataset;
+      const { blamePath } = document.querySelector('.line-numbers').dataset;
+      const blameLink = document.createElement('a');
+      blameLink.classList.add('file-line-blame');
+      blameLink.href = `${blamePath}#L${lineNumber}`;
+
+      const wrapper = document.createElement('div');
+      wrapper.classList.add('line-links', 'diff-line-num');
+
+      wrapper.appendChild(blameLink);
+      wrapper.appendChild(lineLinkCopy);
+      lineLink.replaceWith(wrapper);
+    }
+  });
+}
+
+export default addBlameLink;
diff --git a/app/assets/javascripts/blob/blob_links_tracking.js b/app/assets/javascripts/blob/blob_links_tracking.js
index 9a49aa8b0f..713cc3fad0 100644
--- a/app/assets/javascripts/blob/blob_links_tracking.js
+++ b/app/assets/javascripts/blob/blob_links_tracking.js
@@ -1,7 +1,12 @@
 import Tracking from '~/tracking';
 
-function addBlobLinksTracking(containerSelector, eventsToTrack) {
-  const containerEl = document.querySelector(containerSelector);
+const eventsToTrack = [
+  { selector: '.file-line-blame', property: 'blame' },
+  { selector: '.file-line-num', property: 'link' },
+];
+
+function addBlobLinksTracking() {
+  const containerEl = document.querySelector('.file-holder');
 
   if (!containerEl) {
     return;
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
index a07428dafe..de4b11699f 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
@@ -22,12 +22,16 @@ import AccessorUtils from '~/lib/utils/accessor';
 import { __ } from '~/locale';
 import Tracking from '~/tracking';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
+import { sanitizeUrl } from '~/lib/utils/url_utility';
 import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '../utils';
 import { I18N_ERROR_TRACKING_LIST } from '../constants';
 import ErrorTrackingActions from './error_tracking_actions.vue';
 
 export const tableDataClass = 'table-col d-flex d-md-table-cell align-items-center';
 
+const isValidErrorId = (errorId) => {
+  return /^[0-9]+$/.test(errorId);
+};
 export default {
   FIRST_PAGE: 1,
   PREV_PAGE: 1,
@@ -202,6 +206,9 @@ export default {
       this.searchByQuery(text);
     },
     getDetailsLink(errorId) {
+      if (!isValidErrorId(errorId)) {
+        return 'about:blank';
+      }
       return `error_tracking/${errorId}/details`;
     },
     goToNextPage() {
@@ -222,7 +229,10 @@ export default {
       return filter === this.statusFilter;
     },
     getIssueUpdatePath(errorId) {
-      return `/${this.projectPath}/-/error_tracking/${errorId}.json`;
+      if (!isValidErrorId(errorId)) {
+        return 'about:blank';
+      }
+      return sanitizeUrl(`/${this.projectPath}/-/error_tracking/${errorId}.json`);
     },
     filterErrors(status, label) {
       this.filterValue = label;
diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js
index f7849e8d58..f37a298768 100644
--- a/app/assets/javascripts/pages/projects/init_blob.js
+++ b/app/assets/javascripts/pages/projects/init_blob.js
@@ -4,7 +4,6 @@ import BlobForkSuggestion from '~/blob/blob_fork_suggestion';
 import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater';
 import LineHighlighter from '~/blob/line_highlighter';
 import initBlobBundle from '~/blob_edit/blob_bundle';
-import addBlobLinksTracking from '~/blob/blob_links_tracking';
 
 export default () => {
   new LineHighlighter(); // eslint-disable-line no-new
@@ -16,12 +15,6 @@ export default () => {
     document.querySelectorAll('.js-data-file-blob-permalink-url, .js-blob-blame-link'),
   );
 
-  const eventsToTrack = [
-    { selector: '.file-line-blame', property: 'blame' },
-    { selector: '.file-line-num', property: 'link' },
-  ];
-  addBlobLinksTracking('#blob-content-holder', eventsToTrack);
-
   const fileBlobPermalinkUrlElement = document.querySelector('.js-data-file-blob-permalink-url');
   const fileBlobPermalinkUrl =
     fileBlobPermalinkUrlElement && fileBlobPermalinkUrlElement.getAttribute('href');
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue
index 7999b916e0..78572f11f6 100644
--- a/app/assets/javascripts/repository/components/blob_content_viewer.vue
+++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue
@@ -13,6 +13,7 @@ import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import WebIdeLink from '~/vue_shared/components/web_ide_link.vue';
 import CodeIntelligence from '~/code_navigation/components/app.vue';
 import LineHighlighter from '~/blob/line_highlighter';
+import addBlameLink from '~/blob/blob_blame_link';
 import getRefMixin from '../mixins/get_ref';
 import blobInfoQuery from '../queries/blob_info.query.graphql';
 import userInfoQuery from '../queries/user_info.query.graphql';
@@ -242,6 +243,7 @@ export default {
 
             if (type === SIMPLE_BLOB_VIEWER) {
               new LineHighlighter(); // eslint-disable-line no-new
+              addBlameLink('.file-holder', 'js-line-links');
             }
           });
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
index 1eccc7de66..99576a8dd9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlBadge, GlLink, GlSafeHtmlDirective, GlModalDirective } from '@gitlab/ui';
+import { isArray } from 'lodash';
 import Actions from '../action_buttons.vue';
 import StatusIcon from './status_icon.vue';
 import { generateText } from './utils';
@@ -35,6 +36,20 @@ export default {
       required: true,
     },
   },
+  computed: {
+    subtext() {
+      const { subtext } = this.data;
+      if (subtext) {
+        if (isArray(subtext)) {
+          return subtext.map((t) => generateText(t)).join('<br />');
+        }
+
+        return generateText(subtext);
+      }
+
+      return null;
+    },
+  },
   methods: {
     isArray(arr) {
       return Array.isArray(arr);
@@ -91,11 +106,7 @@ export default {
             @clickedAction="onClickedAction"
           />
         </div>
-        <p
-          v-if="data.subtext"
-          v-safe-html="generateText(data.subtext)"
-          class="gl-m-0 gl-font-sm"
-        ></p>
+        <p v-if="subtext" v-safe-html="subtext" class="gl-m-0 gl-font-sm"></p>
       </div>
     </div>
     <template v-if="data.children && level === 2">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
index cba12507eb..757178ee33 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
@@ -35,6 +35,9 @@ const textStyleTags = {
   [getStartTag('small')]: '<span class="gl-font-sm gl-text-gray-700">',
 };
 
+const escapeText = (text) =>
+  document.createElement('div').appendChild(document.createTextNode(text)).parentNode.innerHTML;
+
 const createText = (text) => {
   return text
     .replace(
@@ -61,7 +64,7 @@ const createText = (text) => {
 
 export const generateText = (text) => {
   if (typeof text === 'string') {
-    return createText(text);
+    return createText(escapeText(text));
   } else if (
     typeof text === 'object' &&
     typeof text.text === 'string' &&
@@ -69,8 +72,8 @@ export const generateText = (text) => {
   ) {
     return createText(
       `${
-        text.prependText ? `${text.prependText} ` : ''
-      }<a class="gl-text-decoration-underline" href="${text.href}">${text.text}</a>`,
+        text.prependText ? `${escapeText(text.prependText)} ` : ''
+      }<a class="gl-text-decoration-underline" href="${text.href}">${escapeText(text.text)}</a>`,
     );
   }
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
index 2477429af5..68347ac269 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
@@ -19,25 +19,23 @@ export default {
       if (errorSummary.errored >= 1 && errorSummary.resolved >= 1) {
         const improvements = sprintf(
           n__(
-            '%{strongOpen}%{errors}%{strongClose} point',
-            '%{strongOpen}%{errors}%{strongClose} points',
+            '%{strong_start}%{errors}%{strong_end} point',
+            '%{strong_start}%{errors}%{strong_end} points',
             resolvedErrors.length,
           ),
           {
             errors: resolvedErrors.length,
-            strongOpen: '<strong>',
-            strongClose: '</strong>',
           },
           false,
         );
 
         const degradations = sprintf(
           n__(
-            '%{strongOpen}%{errors}%{strongClose} point',
-            '%{strongOpen}%{errors}%{strongClose} points',
+            '%{strong_start}%{errors}%{strong_end} point',
+            '%{strong_start}%{errors}%{strong_end} points',
             newErrors.length,
           ),
-          { errors: newErrors.length, strongOpen: '<strong>', strongClose: '</strong>' },
+          { errors: newErrors.length },
           false,
         );
         return sprintf(
@@ -96,14 +94,11 @@ export default {
       this.collapsedData.resolvedErrors.map((e) => {
         return fullData.push({
           text: `${capitalizeFirstCharacter(e.severity)} - ${e.description}`,
-          subtext: sprintf(
-            s__(`ciReport|in %{open_link}${e.file_path}:${e.line}%{close_link}`),
-            {
-              open_link: `<a class="gl-text-decoration-underline" href="${e.urlPath}">`,
-              close_link: '</a>',
-            },
-            false,
-          ),
+          subtext: {
+            prependText: s__(`ciReport|in`),
+            text: `${e.file_path}:${e.line}`,
+            href: e.urlPath,
+          },
           icon: {
             name: SEVERITY_ICONS_EXTENSION[e.severity],
           },
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js
index 6611aedcb0..626a99f7d6 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js
@@ -63,13 +63,16 @@ export default {
       if (valid.length) {
         title = validText;
         if (invalid.length) {
-          subtitle = sprintf(`<br>%{small_start}${invalidText}%{small_end}`);
+          subtitle = invalidText;
         }
       } else {
         title = invalidText;
       }
 
-      return `${title}${subtitle}`;
+      return {
+        subject: title,
+        meta: subtitle,
+      };
     },
     fetchCollapsedData() {
       return axios
@@ -152,9 +155,8 @@ export default {
       }
 
       return {
-        text: `${title}
-        <br>
-        ${subtitle}`,
+        text: title,
+        supportingText: subtitle,
         icon: { name: iconName },
         actions,
       };
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/utils.js b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/utils.js
index 6896f8831e..37f9964d23 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/utils.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/utils.js
@@ -60,7 +60,7 @@ export const reportSubTextBuilder = ({ suite_errors: suiteErrors, summary }) =>
     if (suiteErrors?.base) {
       errors.push(`${i18n.baseReportParsingError} ${suiteErrors.base}`);
     }
-    return errors.join('<br />');
+    return errors;
   }
   return recentFailuresTextBuilder(summary);
 };
diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer.vue b/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer.vue
index ccc8b44942..f471db2488 100644
--- a/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer.vue
@@ -3,6 +3,7 @@ import { GlSafeHtmlDirective, GlLoadingIcon } from '@gitlab/ui';
 import LineHighlighter from '~/blob/line_highlighter';
 import eventHub from '~/notes/event_hub';
 import languageLoader from '~/content_editor/services/highlight_js_language_loader';
+import addBlobLinksTracking from '~/blob/blob_links_tracking';
 import Tracking from '~/tracking';
 import {
   EVENT_ACTION,
@@ -66,6 +67,7 @@ export default {
     },
   },
   async created() {
+    addBlobLinksTracking();
     this.trackEvent(EVENT_LABEL_VIEWER);
 
     if (this.unsupportedLanguage) {
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss
index 2b76e70fa1..ab426f388c 100644
--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -95,23 +95,14 @@ td.line-numbers {
 
 .blob-viewer {
   .line-numbers {
+    min-width: 6rem;
     // for server-side-rendering
     .line-links {
       @include gl-display-flex;
-
-
-      &:first-child {
-        margin-top: 10px;
-      }
-
-      &:last-child {
-        margin-bottom: 10px;
-      }
     }
 
     // for client
     &.line-links {
-      min-width: 6rem;
       border-bottom-left-radius: 0;
 
       + pre {
@@ -120,15 +111,15 @@ td.line-numbers {
     }
   }
 
-  .line-links {
-    &:hover a::before,
-    &:focus-within a::before {
-      @include gl-visibility-visible;
-    }
+  .line-numbers:not(.line-links) a:hover::before,
+  .line-numbers:not(.line-links) a:focus-within::before,
+  .line-links:hover a::before,
+  .line-links:focus-within a::before {
+    @include gl-visibility-visible;
   }
 
+
   .file-line-num {
-    min-width: 4.5rem;
     @include gl-justify-content-end;
     @include gl-flex-grow-1;
     @include gl-pr-3;
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index b35dc3b00c..bcddb889cf 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -88,6 +88,12 @@ module EventsHelper
     end
   end
 
+  def event_target_path(event)
+    return Gitlab::UrlBuilder.build(event.target, only_path: true) if event.work_item?
+
+    event.target_link_options
+  end
+
   def event_feed_title(event)
     words = []
     words << event.author_name
diff --git a/app/models/concerns/integrations/has_web_hook.rb b/app/models/concerns/integrations/has_web_hook.rb
index e6ca6cc793..5fd71f3d72 100644
--- a/app/models/concerns/integrations/has_web_hook.rb
+++ b/app/models/concerns/integrations/has_web_hook.rb
@@ -14,6 +14,11 @@ module Integrations
       raise NotImplementedError
     end
 
+    # Return the url variables to be used for the webhook.
+    def url_variables
+      raise NotImplementedError
+    end
+
     # Return whether the webhook should use SSL verification.
     def hook_ssl_verification
       if respond_to?(:enable_ssl_verification)
@@ -26,7 +31,11 @@ module Integrations
     # Create or update the webhook, raising an exception if it cannot be saved.
     def update_web_hook!
       hook = service_hook || build_service_hook
-      hook.url = hook_url if hook.url != hook_url # avoid reencryption
+
+      # Avoid reencryption
+      hook.url = hook_url if hook.url != hook_url
+      hook.url_variables = url_variables if hook.url_variables != url_variables
+
       hook.enable_ssl_verification = hook_ssl_verification
       hook.save! if hook.changed?
       hook
diff --git a/app/models/concerns/safe_url.rb b/app/models/concerns/safe_url.rb
index 7dce05bddb..d6378e6ac6 100644
--- a/app/models/concerns/safe_url.rb
+++ b/app/models/concerns/safe_url.rb
@@ -3,13 +3,16 @@
 module SafeUrl
   extend ActiveSupport::Concern
 
+  # Return the URL with obfuscated userinfo
+  # and keeping it intact
   def safe_url(allowed_usernames: [])
     return if url.nil?
 
-    uri = URI.parse(url)
+    escaped = Addressable::URI.escape(url)
+    uri = URI.parse(escaped)
     uri.password = '*****' if uri.password
     uri.user = '*****' if uri.user && allowed_usernames.exclude?(uri.user)
-    uri.to_s
-  rescue URI::Error
+    Addressable::URI.unescape(uri.to_s)
+  rescue URI::Error, TypeError
   end
 end
diff --git a/app/models/hooks/web_hook_log.rb b/app/models/hooks/web_hook_log.rb
index 24e5f193a3..82ae71213d 100644
--- a/app/models/hooks/web_hook_log.rb
+++ b/app/models/hooks/web_hook_log.rb
@@ -22,7 +22,7 @@ class WebHookLog < ApplicationRecord
   validates :web_hook, presence: true
 
   before_save :obfuscate_basic_auth
-  before_save :redact_author_email
+  before_save :redact_user_emails
 
   def self.recent
     where('created_at >= ?', 2.days.ago.beginning_of_day)
@@ -54,9 +54,9 @@ class WebHookLog < ApplicationRecord
     self.url = safe_url
   end
 
-  def redact_author_email
-    return unless self.request_data.dig('commit', 'author', 'email').present?
-
-    self.request_data['commit']['author']['email'] = _('[REDACTED]')
+  def redact_user_emails
+    self.request_data.deep_transform_values! do |value|
+      value =~ URI::MailTo::EMAIL_REGEXP ? _('[REDACTED]') : value
+    end
   end
 end
diff --git a/app/models/integrations/buildkite.rb b/app/models/integrations/buildkite.rb
index 7a48e71b93..f2d2aca3ff 100644
--- a/app/models/integrations/buildkite.rb
+++ b/app/models/integrations/buildkite.rb
@@ -50,7 +50,11 @@ module Integrations
 
     override :hook_url
     def hook_url
-      "#{buildkite_endpoint('webhook')}/deliver/#{webhook_token}"
+      "#{buildkite_endpoint('webhook')}/deliver/{webhook_token}"
+    end
+
+    def url_variables
+      { 'webhook_token' => webhook_token }
     end
 
     def execute(data)
diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb
index bb0fb6b907..f6679a3a38 100644
--- a/app/models/integrations/datadog.rb
+++ b/app/models/integrations/datadog.rb
@@ -170,13 +170,17 @@ module Integrations
       url = api_url.presence || sprintf(URL_TEMPLATE, datadog_domain: datadog_domain)
       url = URI.parse(url)
       query = {
-        "dd-api-key" => api_key,
+        "dd-api-key" => 'THIS_VALUE_WILL_BE_REPLACED',
         service: datadog_service.presence,
         env: datadog_env.presence,
         tags: datadog_tags_query_param.presence
       }.compact
       url.query = query.to_query
-      url.to_s
+      url.to_s.gsub('THIS_VALUE_WILL_BE_REPLACED', '{api_key}')
+    end
+
+    def url_variables
+      { 'api_key' => api_key }
     end
 
     def execute(data)
diff --git a/app/models/integrations/drone_ci.rb b/app/models/integrations/drone_ci.rb
index de69afeba6..d1a64aa96d 100644
--- a/app/models/integrations/drone_ci.rb
+++ b/app/models/integrations/drone_ci.rb
@@ -106,7 +106,11 @@ module Integrations
 
     override :hook_url
     def hook_url
-      [drone_url, "/hook", "?owner=#{project.namespace.full_path}", "&name=#{project.path}", "&access_token=#{token}"].join
+      [drone_url, "/hook", "?owner=#{project.namespace.full_path}", "&name=#{project.path}", "&access_token={token}"].join
+    end
+
+    def url_variables
+      { 'token' => token }
     end
 
     override :update_web_hook!
diff --git a/app/models/integrations/jenkins.rb b/app/models/integrations/jenkins.rb
index c68b5fd2a9..74a6449f4f 100644
--- a/app/models/integrations/jenkins.rb
+++ b/app/models/integrations/jenkins.rb
@@ -69,6 +69,10 @@ module Integrations
       url.to_s
     end
 
+    def url_variables
+      {}
+    end
+
     def self.supported_events
       %w(push merge_request tag_push)
     end
diff --git a/app/models/integrations/packagist.rb b/app/models/integrations/packagist.rb
index f91404dab2..7177c82a16 100644
--- a/app/models/integrations/packagist.rb
+++ b/app/models/integrations/packagist.rb
@@ -66,7 +66,11 @@ module Integrations
     override :hook_url
     def hook_url
       base_url = server.presence || 'https://packagist.org'
-      "#{base_url}/api/update-package?username=#{username}&apiToken=#{token}"
+      "#{base_url}/api/update-package?username={username}&apiToken={token}"
+    end
+
+    def url_variables
+      { 'username' => username, 'token' => token }
     end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index afee2d7084..32ddc40ff7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2159,6 +2159,10 @@ class User < ApplicationRecord
     (Date.current - created_at.to_date).to_i
   end
 
+  def webhook_email
+    public_email.presence || _('[REDACTED]')
+  end
+
   protected
 
   # override, from Devise::Validatable
diff --git a/app/policies/issuable_policy.rb b/app/policies/issuable_policy.rb
index 3c5e1020c8..88bb06d6f2 100644
--- a/app/policies/issuable_policy.rb
+++ b/app/policies/issuable_policy.rb
@@ -21,6 +21,12 @@ class IssuablePolicy < BasePolicy
     enable :reopen_issue
   end
 
+  # This rule replicates permissions in NotePolicy#can_read_confidential and it's used in
+  # TodoPolicy for performance reasons
+  rule { can?(:reporter_access) | assignee_or_author | admin }.policy do
+    enable :read_confidential_notes
+  end
+
   rule { can?(:read_merge_request) & assignee_or_author }.policy do
     enable :update_merge_request
     enable :reopen_merge_request
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb
index e85f18f2d3..1bffcc5aea 100644
--- a/app/policies/note_policy.rb
+++ b/app/policies/note_policy.rb
@@ -20,6 +20,7 @@ class NotePolicy < BasePolicy
 
   condition(:confidential, scope: :subject) { @subject.confidential? }
 
+  # If this condition changes IssuablePolicy#read_confidential_notes should be updated too
   condition(:can_read_confidential) do
     access_level >= Gitlab::Access::REPORTER || @subject.noteable_assignee_or_author?(@user) || admin?
   end
diff --git a/app/policies/todo_policy.rb b/app/policies/todo_policy.rb
index 6237fbc50f..5c24964f24 100644
--- a/app/policies/todo_policy.rb
+++ b/app/policies/todo_policy.rb
@@ -5,10 +5,25 @@ class TodoPolicy < BasePolicy
   condition(:own_todo) do
     @user && @subject.user_id == @user.id
   end
+
+  desc "User can read the todo's target"
   condition(:can_read_target) do
     @user && @subject.target&.readable_by?(@user)
   end
 
+  desc "Todo has confidential note"
+  condition(:has_confidential_note, scope: :subject) { @subject&.note&.confidential? }
+
+  desc "User can read the todo's confidential note"
+  condition(:can_read_todo_confidential_note) do
+    @user && @user.can?(:read_confidential_notes, @subject.target)
+  end
+
   rule { own_todo & can_read_target }.enable :read_todo
-  rule { own_todo & can_read_target }.enable :update_todo
+  rule { can?(:read_todo) }.enable :update_todo
+
+  rule { has_confidential_note & ~can_read_todo_confidential_note }.policy do
+    prevent :read_todo
+    prevent :update_todo
+  end
 end
diff --git a/app/services/base_project_service.rb b/app/services/base_project_service.rb
index 1bf4a235a7..8cb6b632a9 100644
--- a/app/services/base_project_service.rb
+++ b/app/services/base_project_service.rb
@@ -7,7 +7,9 @@ class BaseProjectService < ::BaseContainerService
   attr_accessor :project
 
   def initialize(project:, current_user: nil, params: {})
-    super(container: project, current_user: current_user, params: params)
+    # we need to exclude project params since they may come from external requests. project should always
+    # be passed as part of the service's initializer
+    super(container: project, current_user: current_user, params: params.except(:project, :project_id))
 
     @project = project
   end
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index bf5be70806..7250ce5c0b 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -14,7 +14,12 @@ class FileUploader < GitlabUploader
   include ObjectStorage::Concern
   prepend ObjectStorage::Extension::RecordsUploads
 
-  MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)}.freeze
+  # This pattern is vulnerable to malicious inputs, so use Gitlab::UntrustedRegexp
+  # to place bounds on execution time
+  MARKDOWN_PATTERN = Gitlab::UntrustedRegexp.new(
+    '!?\[.*?\]\(/uploads/(?P<secret>[0-9a-f]{32})/(?P<file>.*?)\)'
+  )
+
   DYNAMIC_PATH_PATTERN = %r{.*(?<secret>\b(\h{10}|\h{32}))\/(?<identifier>.*)}.freeze
   VALID_SECRET_PATTERN = %r{\A\h{10,32}\z}.freeze
 
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 93c6efc908..1f6ac29bff 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -8,7 +8,7 @@
     %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
       = event.action_name
     %span.event-target-type.gl-mr-2= event.target_type_name
-    = link_to event.target_link_options, class: 'has-tooltip event-target-link gl-mr-2', title: event.target_title do
+    = link_to event_target_path(event), class: 'has-tooltip event-target-link gl-mr-2', title: event.target_title do
       = event.target.reference_link_text
     - unless event.milestone?
       %span.event-target-title.gl-text-overflow-ellipsis.gl-overflow-hidden.gl-mr-2{ dir: "auto" }
diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml
index 23a17c07ea..130e73a069 100644
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
@@ -1,17 +1,14 @@
 #blob-content.file-content.code.js-syntax-highlight
   -  offset = defined?(first_line_number) ? first_line_number : 1
-  .line-numbers{ class: "gl-p-0\!" }
+  - blame_path = project_blame_path(@project, tree_join(@ref, blob.path))
+  .line-numbers{ class: "gl-px-0!", data: { blame_path: blame_path } }
     - if blob.data.present?
       - link = blob_link if defined?(blob_link)
-      - blame_link = project_blame_path(@project, tree_join(@ref, blob.path))
       - blob.data.each_line.each_with_index do |_, index|
         - i = index + offset
         -# We're not using `link_to` because it is too slow once we get to thousands of lines.
-        .line-links.diff-line-num
-          - if Feature.enabled?(:file_line_blame)
-            %a.file-line-blame{ href: "#{blame_link}#L#{i}" }
-          %a.file-line-num{ href: "#{link}#L#{i}", id: "L#{i}", 'data-line-number' => i }
-            = i
+        %a.file-line-num.diff-line-num{ class: ("js-line-links" if Feature.enabled?(:file_line_blame)), href: "#{link}#L#{i}", id: "L#{i}", 'data-line-number' => i }
+          = i
   - highlight = defined?(highlight_line) && highlight_line ? highlight_line - offset : nil
   .blob-content{ data: { blob_id: blob.id, path: blob.path, highlight_line: highlight, qa_selector: 'file_content' } }
     %pre.code.highlight
diff --git a/data/whats_new/2022082200001_15_03.yml b/data/whats_new/2022082200001_15_03.yml
new file mode 100644
index 0000000000..b0a2bf3b6e
--- /dev/null
+++ b/data/whats_new/2022082200001_15_03.yml
@@ -0,0 +1,70 @@
+- name: "Create tasks in issues"
+  description: |
+    Tasks provide a robust way to refine an issue into smaller, discrete work units. Previously in GitLab, you could break down an issue into smaller parts using markdown checklists within the description. However, these checklist items could not be easily assigned, labeled, or managed anywhere outside of the description field.
+
+    You can now create tasks within issues from the Child Items widget. Then, you can open the task directly within the issue to quickly update the title, set the weight, or add a description. Tasks break down work within projects for GitLab Free and increase the planning hierarchy for our GitLab Premium customers to three levels (epic, issue, and task). In our next iteration, you will be able to add labels, milestones, and iterations to each task.
+
+    Tasks represent our first step toward evolving issues, epics, incidents, requirements, and test cases to [work items](https://docs.gitlab.com/ee/development/work_items.html). If you have feedback or suggestions about tasks, please comment on [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/363613).
+  stage: plan
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/tasks.html
+  image_url: https://about.gitlab.com/images/15_3/create-tasks.gif
+  published_at: 2022-08-22
+  release: 15.3
+- name: "GitOps features are now free"
+  description: |
+    When you use GitOps to update a Kubernetes cluster, also called a pull-based deployment, you get an improved security model, better scalability and stability.
+
+    The GitLab agent for Kubernetes has supported [GitOps workflows](https://docs.gitlab.com/ee/user/clusters/agent/gitops.html) from its initial release, but until now, the functionality was available only if you had a GitLab Premium or Ultimate subscription. Now if you have a Free subscription, you also get pull-based deployment support. The features available in GitLab Free should serve small, high-trust teams or be suitable to test the agent before upgrading to a higher tier.
+
+    In the future, we plan to add [built-in multi-tenant support](https://gitlab.com/gitlab-org/gitlab/-/issues/337904) for Premium subscriptions. This feature would be similar to the impersonation feature already available for the [CI/CD workflow](https://docs.gitlab.com/ee/user/clusters/agent/ci_cd_workflow.html#restrict-project-and-group-access-by-using-impersonation).
+  stage: configure
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/clusters/agent/gitops.html
+  image_url: https://img.youtube.com/vi/jgVxOnMfOZA/hqdefault.jpg
+  published_at: 2022-08-22
+  release: 15.3
+- name: "Submit merge request review with summary comment"
+  description: |
+    When you finish reviewing a merge request, there are probably some common things that you do, like summarizing your review for others or approving the changes if they look good to you. Those common tasks are now quicker and easier: when you submit your review, you can add a summary comment along with any [quick actions](https://docs.gitlab.com/ee/user/project/quick_actions.html) like `/approve`.
+  stage: create
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#submit-a-review
+  image_url: https://about.gitlab.com/images/15_3/create-mr-review-summary.png
+  published_at: 2022-08-22
+  release: 15.3
+- name: "Define password complexity requirements"
+  description: |
+    GitLab administrators can now define password complexity requirements in addition to minimum password length. For new passwords, you can now require:
+
+    - Numbers.
+    - Uppercase letters.
+    - Lowercase letters.
+    - Symbols.
+
+    Complex passwords are less likely to be compromised, and the ability to configure password complexity requirements helps administrators enforce their password policies.
+  stage: manage
+  self-managed: true
+  gitlab-com: false
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/admin_area/settings/sign_up_restrictions.html#password-complexity-requirements
+  image_url: https://about.gitlab.com/images/15_3/manage-password-complexity-policy.png
+  published_at: 2022-08-22
+  release: 15.3
+- name: "Maintain SAML Group Links with API"
+  description: |
+    Until now, SAML group links had to be configured in the UI. Now, you can manage SAML group links programmatically using the API so you can automate SAML groups management.
+  stage: manage
+  self-managed: true
+  gitlab-com: true
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/api/groups.html#saml-group-links
+  image_url: https://img.youtube.com/vi/Pft61UFM5LM/hqdefault.jpg
+  published_at: 2022-08-22
+  release: 15.3
diff --git a/doc/api/groups.md b/doc/api/groups.md
index 588ab2a582..9cbd12e664 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -1444,7 +1444,7 @@ response attributes:
 | Attribute          | Type   | Description                                                                          |
 |:-------------------|:-------|:-------------------------------------------------------------------------------------|
 | `[].name`          | string | Name of the SAML group                                                               |
-| `[].access_level`  | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `[].access_level`  | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1458,11 +1458,11 @@ Example response:
 [
   {
     "name": "saml-group-1",
-    "access_level": "Guest"
+    "access_level": 10
   },
   {
     "name": "saml-group-2",
-    "access_level": "Maintainer"
+    "access_level": 40
   }
 ]
 ```
@@ -1488,7 +1488,7 @@ response attributes:
 | Attribute      | Type   | Description                                                                          |
 |:---------------|:-------|:-------------------------------------------------------------------------------------|
 | `name`         | string | Name of the SAML group                                                               |
-| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1501,7 +1501,7 @@ Example response:
 ```json
 {
 "name": "saml-group-1",
-"access_level": "Guest"
+"access_level": 10
 }
 ```
 
@@ -1519,7 +1519,7 @@ Supported attributes:
 |:-------------------|:---------------|:---------|:-------------------------------------------------------------------------------------|
 | `id`               | integer/string | yes      | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding)             |
 | `saml_group_name`  | string         | yes      | Name of a SAML group                                                                 |
-| `access_level`     | string         | yes      | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level`     | integer         | yes      | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 If successful, returns [`201`](index.md#status-codes) and the following
 response attributes:
@@ -1527,7 +1527,7 @@ response attributes:
 | Attribute      | Type   | Description                                                                          |
 |:---------------|:-------|:-------------------------------------------------------------------------------------|
 | `name`         | string | Name of the SAML group                                                               |
-| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1540,7 +1540,7 @@ Example response:
 ```json
 {
 "name": "saml-group-1",
-"access_level": "Guest"
+"access_level": 10
 }
 ```
 
diff --git a/doc/api/settings.md b/doc/api/settings.md
index c736c0df1d..d11269113a 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -274,6 +274,7 @@ listed in the descriptions of the relevant settings.
 | `container_registry_token_expire_delay`  | integer          | no                                   | Container Registry token duration in minutes. |
 | `package_registry_cleanup_policies_worker_capacity`  | integer          | no                  | Number of workers assigned to the packages cleanup policies. |
 | `deactivate_dormant_users`               | boolean          | no                                   | Enable [automatic deactivation of dormant users](../user/admin_area/moderate_users.md#automatically-deactivate-dormant-users). |
+| `deactivate_dormant_users_period`        | integer          | no                                   | Length of time (in days) after which a user is considered dormant. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336747) in GitLab 15.3. |
 | `default_artifacts_expire_in`            | string           | no                                   | Set the default expiration time for each job's artifacts. |
 | `default_branch_name`                    | string           | no                                   | [Instance-level custom initial branch name](../user/project/repository/branches/default.md#instance-level-custom-initial-branch-name) ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225258) in GitLab 13.2). |
 | `default_branch_protection`              | integer          | no                                   | Determine if developers can push to the default branch. Can take: `0` _(not protected, both users with the Developer role or Maintainer role can push new commits and force push)_, `1` _(partially protected, users with the Developer role or Maintainer role can push new commits, but cannot force push)_ or `2` _(fully protected, users with the Developer or Maintainer role cannot push new commits, but users with the Developer or Maintainer role can; no one can force push)_ as a parameter. Default is `2`. |
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index c89dd3f65f..eca94fce2e 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -200,6 +200,10 @@ The following table lists project permissions available for each role:
 | [Security dashboard](application_security/security_dashboard/index.md):<br>Use security dashboard                                                                                    |          |          | ✓         | ✓          | ✓        |
 | [Security dashboard](application_security/security_dashboard/index.md):<br>View vulnerability                                                                                        |          |          | ✓         | ✓          | ✓        |
 | [Security dashboard](application_security/security_dashboard/index.md):<br>View vulnerability findings in [dependency list](application_security/dependency_list/index.md)           |          |          | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Create (*18*)     | ✓        | ✓        | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Edit              |          | ✓         | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Remove from issue |          | ✓         | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Delete (*22*)     |          |           |            |            | ✓        |
 | [Terraform](infrastructure/index.md):<br>Read Terraform state                                                                                                                        |          |          | ✓         | ✓          | ✓        |
 | [Terraform](infrastructure/index.md):<br>Manage Terraform state                                                                                                                      |          |          |           | ✓          | ✓        |
 | [Test cases](../ci/test_cases/index.md):<br>Archive                                                                                                                                  |          | ✓        | ✓         | ✓          | ✓        |
@@ -235,10 +239,11 @@ The following table lists project permissions available for each role:
 16. In GitLab 14.5 or later, Guests are not allowed to [create incidents](../operations/incident_management/incidents.md#incident-creation).
     In GitLab 15.1 and later, a Guest who created an issue that was promoted to an incident cannot edit, close, or reopen their incident.
 17. In projects that accept contributions from external members, users can create, edit, and close their own merge requests.
-18. Authors and assignees of issues can modify the title and description even if they don't have the Reporter role.
+18. Authors and assignees can modify the title and description even if they don't have the Reporter role.
 19. Authors and assignees can close and reopen issues even if they don't have the Reporter role.
 20. The ability to view the Container Registry and pull images is controlled by the [Container Registry's visibility permissions](packages/container_registry/index.md#container-registry-visibility-permissions).
 21. Maintainers cannot create, demote, or remove Owners, and they cannot promote users to the Owner role. They also cannot approve Owner role access requests.
+22. Authors of tasks can delete them even if they don't have the Owner role, but they have to have at least the Guest role for the project.
 
 <!-- markdownlint-enable MD029 -->
 
diff --git a/doc/user/tasks.md b/doc/user/tasks.md
index b5c2c4eb3a..16e5c85a35 100644
--- a/doc/user/tasks.md
+++ b/doc/user/tasks.md
@@ -38,25 +38,64 @@ to work items and adding custom work item types, visit
 [epic 6033](https://gitlab.com/groups/gitlab-org/-/epics/6033) or
 [Plan direction page](https://about.gitlab.com/direction/plan/).
 
+## View tasks
+
+View tasks in issues, in the **Child items** section.
+
+You can also [filter the list of issues](project/issues/managing_issues.md#filter-the-list-of-issues)
+for `Type = task`.
+
 ## Create a task
 
+Prerequisites:
+
+- You must have at least the Guest role for the project, or the project must be public.
+
 To create a task:
 
-1. In an issue description, create a [task list](markdown.md#task-lists).
-1. Hover over a task item and select **Create task** (**{doc-new}**).
+1. In an issue description, in the **Child items** section, select **Add a task**.
+1. Enter the task title.
+1. Select **Create task**.
 
 ## Edit a task
 
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
 To edit a task:
 
-1. In the issue description, view the task links.
-1. Select a link. The task is displayed.
-   - To edit the description, select **Edit**, then select **Save**.
-   - To edit the title or state, make your changes, then select any area outside the field. The changes are saved automatically.
+1. In the issue description, in the **Child items** section, select the task you want to edit.
+   The task window opens.
+1. Optional. To edit the title, select it and make your changes.
+1. Optional. To edit the description, select the edit icon (**{pencil}**), make your changes, and
+   select **Save**.
+1. Select the close icon (**{close}**).
+
+## Remove a task from an issue
+
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
+You can remove a task from an issue. The task is not deleted, but the two are no longer connected.
+It's not possible to connect them again.
+
+To remove a task from an issue:
+
+1. In the issue description, in the **Child items** section, next to the task you want to remove, select the options menu (**{ellipsis_v}**).
+1. Select **Remove task**.
 
 ## Delete a task
 
+Prerequisites:
+
+- You must either:
+  - Be the author of the task and have at least the Guest role for the project.
+  - Have the Owner role for the project.
+
 To delete a task:
 
-1. In the issue description, select the task.
-1. From the options menu (**{ellipsis_v}**), select **Delete task**.
+1. In the issue description, in the **Child items** section, select the task you want to edit.
+1. In the task window, in the options menu (**{ellipsis_v}**), select **Delete task**.
+1. Select **OK**.
diff --git a/elasticsearch-rails/.gitignore b/elasticsearch-rails/.gitignore
deleted file mode 100644
index 43ddc2e308..0000000000
--- a/elasticsearch-rails/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.DS_Store
-*.log
-tmp/
-.idea/*
-
-.yardoc/
-_yardoc/
-coverage/
-rdoc/
-doc/
-Gemfile.lock
diff --git a/elasticsearch-rails/.travis.yml b/elasticsearch-rails/.travis.yml
deleted file mode 100644
index 4199554dca..0000000000
--- a/elasticsearch-rails/.travis.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# -----------------------------------------------------------------------------
-# Configuration file for http://travis-ci.org/elasticsearch/elasticsearch-rails
-# -----------------------------------------------------------------------------
-
-dist: trusty
-
-sudo: required
-
-language: ruby
-
-services:
-  - mongodb
-
-branches:
-  only:
-    - master
-    - travis
-    - 5.x
-    - 6.x
-    - 2.x
-
-matrix:
-  include:
-    - rvm: 2.2
-      jdk: oraclejdk8
-      env: RAILS_VERSIONS=3.0
-
-    - rvm: 2.3.8
-      jdk: oraclejdk8
-      env: RAILS_VERSIONS=5.0
-
-    - rvm: 2.6.1
-      jdk: oraclejdk8
-      env: RAILS_VERSIONS=4.0,5.0
-
-    - rvm: jruby-9.2.5.0
-      jdk: oraclejdk8
-      env: RAILS_VERSIONS=5.0
-
-env:
-  global:
-    - ELASTICSEARCH_VERSION=6.4.0
-    - QUIET=true
-
-
-before_install:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.deb
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.deb.sha512
-  - shasum -a 512 -c elasticsearch-${ELASTICSEARCH_VERSION}.deb.sha512
-  - sudo dpkg -i --force-confnew elasticsearch-${ELASTICSEARCH_VERSION}.deb
-  - sudo service elasticsearch start
-  - gem update --system
-  - gem update bundler
-  - gem --version
-  - bundle version
-
-install:
-  - bundle install
-  - rake bundle:clean
-  - rake bundle:install
-
-script:
-  - rake test:all
-
-notifications:
-  disable: true
diff --git a/elasticsearch-rails/elasticsearch-model/.gitignore b/elasticsearch-rails/elasticsearch-model/.gitignore
deleted file mode 100644
index 8a8ab46135..0000000000
--- a/elasticsearch-rails/elasticsearch-model/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-gemfiles/3.0.gemfile.lock
-gemfiles/4.0.gemfile.lock
-gemfiles/5.0.gemfile.lock
diff --git a/elasticsearch-rails/elasticsearch-model/CHANGELOG.md b/elasticsearch-rails/elasticsearch-model/CHANGELOG.md
deleted file mode 100644
index 1b28033835..0000000000
--- a/elasticsearch-rails/elasticsearch-model/CHANGELOG.md
+++ /dev/null
@@ -1,74 +0,0 @@
-## 0.1.9
-
-* Added a `suggest` method to wrap the suggestions in response
-* Added the `:includes` option to Adapter::ActiveRecord::Records for eagerly loading associated models
-* Delegated `max_pages` method properly for Kaminari's `next_page`
-* Fixed `#dup` behaviour for Elasticsearch::Model
-* Fixed typos in the README and examples
-
-## 0.1.8
-
-* Added "default per page" methods for pagination with multi model searches
-* Added a convenience accessor for the `aggregations` part of response
-* Added a full example with mapping for the completion suggester
-* Added an integration test for paginating multiple models
-* Added proper support for the new "multi_fields" in the mapping DSL
-* Added the `no_timeout` option for `__find_in_batches` in the Mongoid adapter
-* Added, that index settings can be loaded from any object that responds to `:read`
-* Added, that index settings/mappings can be loaded from a YAML or JSON file
-* Added, that String pagination parameters are converted to numbers
-* Added, that empty block is not required for setting mapping options
-* Added, that on MyModel#import, an exception is raised if the index does not exists
-* Changed the Elasticsearch port in the Mongoid example to 9200
-* Cleaned up the tests for multiple fields/properties in mapping DSL
-* Fixed a bug where continuous `#save` calls emptied the `@__changed_attributes` variable
-* Fixed a buggy test introduced in #335
-* Fixed incorrect deserialization of records in the Multiple adapter
-* Fixed incorrect examples and documentation
-* Fixed unreliable order of returned results/records in the integration test for the multiple adapter
-* Fixed, that `param_name` is used when paginating with WillPaginate
-* Fixed the problem where `document_type` configuration was not propagated to mapping [6 months ago by Miguel Ferna
-* Refactored the code in `__find_in_batches` to use Enumerable#each_slice
-* Refactored the string queries in multiple_models_test.rb to avoid quote escaping
-
-## 0.1.7
-
-* Improved examples and instructions in README and code annotations
-* Prevented index methods to swallow all exceptions
-* Added the `:validate` option to the `save` method for models
-* Added support for searching across multiple models (elastic/elasticsearch-rails#345),
-  including documentation, examples and tests
-
-## 0.1.6
-
-* Improved documentation
-* Added dynamic getter/setter (block/proc) for `MyModel.index_name`
-* Added the `update_document_attributes` method
-* Added, that records to import can be limited by the `query` option
-
-## 0.1.5
-
-* Improved documentation
-* Fixes and improvements to the "will_paginate" integration
-* Added a `:preprocess` option to the `import` method
-* Changed, that attributes are fetched from `as_indexed_json` in the `update_document` method
-* Added an option to the import method to return an array of error messages instead of just count
-* Fixed many problems with dependency hell
-* Fixed tests so they run on Ruby 2.2
-
-## 0.1.2
-
-* Properly delegate existence methods like `result.foo?` to `result._source.foo`
-* Exception is raised when `type` is not passed to Mappings#new
-* Allow passing an ActiveRecord scope to the `import` method
-* Added, that `each_with_hit` and `map_with_hit` in `Elasticsearch::Model::Response::Records` call `to_a`
-* Added support for [`will_paginate`](https://github.com/mislav/will_paginate) pagination library
-* Added the ability to transform models during indexing
-* Added explicit `type` and `id` methods to Response::Result, aliasing `_type` and `_id`
-
-## 0.1.1
-
-* Improved documentation and tests
-* Fixed Kaminari implementation bugs and inconsistencies
-
-## 0.1.0 (Initial Version)
diff --git a/elasticsearch-rails/elasticsearch-model/Gemfile b/elasticsearch-rails/elasticsearch-model/Gemfile
deleted file mode 100644
index c016d096dc..0000000000
--- a/elasticsearch-rails/elasticsearch-model/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in elasticsearch-model.gemspec
-gemspec
-
-group :development, :testing do
-  gem 'rspec'
-  gem 'pry-nav'
-end
diff --git a/elasticsearch-rails/elasticsearch-model/LICENSE.txt b/elasticsearch-rails/elasticsearch-model/LICENSE.txt
deleted file mode 100644
index 7dc94b3e5a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/LICENSE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2014 Elasticsearch
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/elasticsearch-rails/elasticsearch-model/README.md b/elasticsearch-rails/elasticsearch-model/README.md
deleted file mode 100644
index 9c143ba9a6..0000000000
--- a/elasticsearch-rails/elasticsearch-model/README.md
+++ /dev/null
@@ -1,774 +0,0 @@
-# Elasticsearch::Model
-
-The `elasticsearch-model` library builds on top of the
-the [`elasticsearch`](https://github.com/elastic/elasticsearch-ruby) library.
-
-It aims to simplify integration of Ruby classes ("models"), commonly found
-e.g. in [Ruby on Rails](http://rubyonrails.org) applications, with the
-[Elasticsearch](http://www.elasticsearch.org) search and analytics engine.
-
-## Compatibility
-
-This library is compatible with Ruby 1.9.3 and higher.
-
-The library version numbers follow the Elasticsearch major versions, and the `master` branch
-is compatible with the Elasticsearch `master` branch, therefore, with the next major version.
-
-| Rubygem       |   | Elasticsearch |
-|:-------------:|:-:| :-----------: |
-| 0.1           | → | 1.x           |
-| 2.x           | → | 2.x           |
-| 5.x           | → | 5.x           |
-| 6.x           | → | 6.x           |
-| master        | → | master        |
-
-## Installation
-
-Install the package from [Rubygems](https://rubygems.org):
-
-    gem install elasticsearch-model
-
-To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://bundler.io):
-
-    gem 'elasticsearch-model', git: 'git://github.com/elastic/elasticsearch-rails.git', branch: '5.x'
-
-or install it from a source code checkout:
-
-    git clone https://github.com/elastic/elasticsearch-rails.git
-    cd elasticsearch-rails/elasticsearch-model
-    bundle install
-    rake install
-
-
-## Usage
-
-Let's suppose you have an `Article` model:
-
-```ruby
-require 'active_record'
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-ActiveRecord::Schema.define(version: 1) { create_table(:articles) { |t| t.string :title } }
-
-class Article < ActiveRecord::Base; end
-
-Article.create title: 'Quick brown fox'
-Article.create title: 'Fast black dogs'
-Article.create title: 'Swift green frogs'
-```
-
-### Setup
-
-To add the Elasticsearch integration for this model, require `elasticsearch/model`
-and include the main module in your class:
-
-```ruby
-require 'elasticsearch/model'
-
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-end
-```
-
-This will extend the model with functionality related to Elasticsearch.
-
-#### Feature Extraction Pattern
-
-Instead of including the `Elasticsearch::Model` module directly in your model,
-you can include it in a "concern" or "trait" module, which is quite common pattern in Rails applications,
-using e.g.  `ActiveSupport::Concern` as the instrumentation:
-
-```ruby
-# In: app/models/concerns/searchable.rb
-#
-module Searchable
-  extend ActiveSupport::Concern
-
-  included do
-    include Elasticsearch::Model
-
-    mapping do
-      # ...
-    end
-
-    def self.search(query)
-      # ...
-    end
-  end
-end
-
-# In: app/models/article.rb
-#
-class Article
-  include Searchable
-end
-```
-
-#### The `__elasticsearch__` Proxy
-
-The `Elasticsearch::Model` module contains a big amount of class and instance methods to provide
-all its functionality. To prevent polluting your model namespace, this functionality is primarily
-available via the `__elasticsearch__` class and instance level proxy methods;
-see the `Elasticsearch::Model::Proxy` class documentation for technical information.
-
-The module will include important methods, such as `search`, into the class or module only
-when they haven't been defined already. Following two calls are thus functionally equivalent:
-
-```ruby
-Article.__elasticsearch__.search 'fox'
-Article.search 'fox'
-```
-
-See the `Elasticsearch::Model` module documentation for technical information.
-
-### The Elasticsearch client
-
-The module will set up a [client](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch),
-connected to `localhost:9200`, by default. You can access and use it as any other `Elasticsearch::Client`:
-
-```ruby
-Article.__elasticsearch__.client.cluster.health
-# => { "cluster_name"=>"elasticsearch", "status"=>"yellow", ... }
-```
-
-To use a client with different configuration, just set up a client for the model:
-
-```ruby
-Article.__elasticsearch__.client = Elasticsearch::Client.new host: 'api.server.org'
-```
-
-Or configure the client for all models:
-
-```ruby
-Elasticsearch::Model.client = Elasticsearch::Client.new log: true
-```
-
-You might want to do this during your application bootstrap process, e.g. in a Rails initializer.
-
-Please refer to the
-[`elasticsearch-transport`](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-transport)
-library documentation for all the configuration options, and to the
-[`elasticsearch-api`](http://rubydoc.info/gems/elasticsearch-api) library documentation
-for information about the Ruby client API.
-
-### Importing the data
-
-The first thing you'll want to do is importing your data into the index:
-
-```ruby
-Article.import
-# => 0
-```
-
-It's possible to import only records from a specific `scope` or `query`, transform the batch with the `transform`
-and `preprocess` options, or re-create the index by deleting it and creating it with correct mapping with the `force` option -- look for examples in the method documentation.
-
-No errors were reported during importing, so... let's search the index!
-
-
-### Searching
-
-For starters, we can try the "simple" type of search:
-
-```ruby
-response = Article.search 'fox dogs'
-
-response.took
-# => 3
-
-response.results.total
-# => 2
-
-response.results.first._score
-# => 0.02250402
-
-response.results.first._source.title
-# => "Quick brown fox"
-```
-
-#### Search results
-
-The returned `response` object is a rich wrapper around the JSON returned from Elasticsearch,
-providing access to response metadata and the actual results ("hits").
-
-Each "hit" is wrapped in the `Result` class, and provides method access
-to its properties via [`Hashie::Mash`](http://github.com/intridea/hashie).
-
-The `results` object supports the `Enumerable` interface:
-
-```ruby
-response.results.map { |r| r._source.title }
-# => ["Quick brown fox", "Fast black dogs"]
-
-response.results.select { |r| r.title =~ /^Q/ }
-# => [#<Elasticsearch::Model::Response::Result:0x007 ... "_source"=>{"title"=>"Quick brown fox"}}>]
-```
-
-In fact, the `response` object will delegate `Enumerable` methods to `results`:
-
-```ruby
-response.any? { |r| r.title =~ /fox|dog/ }
-# => true
-```
-
-To use `Array`'s methods (including any _ActiveSupport_ extensions), just call `to_a` on the object:
-
-```ruby
-response.to_a.last.title
-# "Fast black dogs"
-```
-
-#### Search results as database records
-
-Instead of returning documents from Elasticsearch, the `records` method will return a collection
-of model instances, fetched from the primary database, ordered by score:
-
-```ruby
-response.records.to_a
-# Article Load (0.3ms)  SELECT "articles".* FROM "articles" WHERE "articles"."id" IN (1, 2)
-# => [#<Article id: 1, title: "Quick brown fox">, #<Article id: 2, title: "Fast black dogs">]
-```
-
-The returned object is the genuine collection of model instances returned by your database,
-i.e. `ActiveRecord::Relation` for ActiveRecord, or `Mongoid::Criteria` in case of MongoDB.
-
-This allows you to chain other methods on top of search results, as you would normally do:
-
-```ruby
-response.records.where(title: 'Quick brown fox').to_a
-# Article Load (0.2ms)  SELECT "articles".* FROM "articles" WHERE "articles"."id" IN (1, 2) AND "articles"."title" = 'Quick brown fox'
-# => [#<Article id: 1, title: "Quick brown fox">]
-
-response.records.records.class
-# => ActiveRecord::Relation::ActiveRecord_Relation_Article
-```
-
-The ordering of the records by score will be preserved, unless you explicitly specify a different
-order in your model query language:
-
-```ruby
-response.records.order(:title).to_a
-# Article Load (0.2ms)  SELECT "articles".* FROM "articles" WHERE "articles"."id" IN (1, 2) ORDER BY "articles".title ASC
-# => [#<Article id: 2, title: "Fast black dogs">, #<Article id: 1, title: "Quick brown fox">]
-```
-
-The `records` method returns the real instances of your model, which is useful when you want to access your
-model methods -- at the expense of slowing down your application, of course.
-In most cases, working with `results` coming from Elasticsearch is sufficient, and much faster. See the
-[`elasticsearch-rails`](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-rails)
-library for more information about compatibility with the Ruby on Rails framework.
-
-When you want to access both the database `records` and search `results`, use the `each_with_hit`
-(or `map_with_hit`) iterator:
-
-```ruby
-response.records.each_with_hit { |record, hit| puts "* #{record.title}: #{hit._score}" }
-# * Quick brown fox: 0.02250402
-# * Fast black dogs: 0.02250402
-```
-
-#### Searching multiple models
-
-It is possible to search across multiple models with the module method:
-
-```ruby
-Elasticsearch::Model.search('fox', [Article, Comment]).results.to_a.map(&:to_hash)
-# => [
-#      {"_index"=>"articles", "_type"=>"article", "_id"=>"1", "_score"=>0.35136628, "_source"=>...},
-#      {"_index"=>"comments", "_type"=>"comment", "_id"=>"1", "_score"=>0.35136628, "_source"=>...}
-#    ]
-
-Elasticsearch::Model.search('fox', [Article, Comment]).records.to_a
-# Article Load (0.3ms)  SELECT "articles".* FROM "articles" WHERE "articles"."id" IN (1)
-# Comment Load (0.2ms)  SELECT "comments".* FROM "comments" WHERE "comments"."id" IN (1,5)
-# => [#<Article id: 1, title: "Quick brown fox">, #<Comment id: 1, body: "Fox News">,  ...]
-```
-
-By default, all models which include the `Elasticsearch::Model` module are searched.
-
-NOTE: It is _not_ possible to chain other methods on top of the `records` object, since it
-      is a heterogenous collection, with models potentially backed by different databases.
-
-#### Pagination
-
-You can implement pagination with the `from` and `size` search parameters. However, search results
-can be automatically paginated with the [`kaminari`](http://rubygems.org/gems/kaminari) or
-[`will_paginate`](https://github.com/mislav/will_paginate) gems.
-(The pagination gems must be added before the Elasticsearch gems in your Gemfile,
-or loaded first in your application.)
-
-If Kaminari or WillPaginate is loaded, use the familiar paging methods:
-
-```ruby
-response.page(2).results
-response.page(2).records
-```
-
-In a Rails controller, use the `params[:page]` parameter to paginate through results:
-
-```ruby
-@articles = Article.search(params[:q]).page(params[:page]).records
-
-@articles.current_page
-# => 2
-@articles.next_page
-# => 3
-```
-To initialize and include the Kaminari pagination support manually:
-
-```ruby
-Kaminari::Hooks.init if defined?(Kaminari::Hooks)
-Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
-```
-
-#### The Elasticsearch DSL
-
-In most situations, you'll want to pass the search definition
-in the Elasticsearch [domain-specific language](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html) to the client:
-
-```ruby
-response = Article.search query:     { match:  { title: "Fox Dogs" } },
-                          highlight: { fields: { title: {} } }
-
-response.results.first.highlight.title
-# ["Quick brown <em>fox</em>"]
-```
-
-You can pass any object which implements a `to_hash` method, which is called automatically,
-so you can use a custom class or your favourite JSON builder to build the search definition:
-
-```ruby
-require 'jbuilder'
-
-query = Jbuilder.encode do |json|
-  json.query do
-    json.match do
-      json.title do
-        json.query "fox dogs"
-      end
-    end
-  end
-end
-
-response = Article.search query
-response.results.first.title
-# => "Quick brown fox"
-```
-
-Also, you can use the [**`elasticsearch-dsl`**](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-dsl) library, which provides a specialized Ruby API for
-the Elasticsearch Query DSL:
-
-```ruby
-require 'elasticsearch/dsl'
-
-query = Elasticsearch::DSL::Search.search do
-  query do
-    match :title do
-      query 'fox dogs'
-    end
-  end
-end
-
-response = Article.search query
-response.results.first.title
-# => "Quick brown fox"
-```
-
-### Index Configuration
-
-For proper search engine function, it's often necessary to configure the index properly.
-The `Elasticsearch::Model` integration provides class methods to set up index settings and mappings.
-
-**NOTE**: Elasticsearch will automatically create an index when a document is indexed,
-          with default settings and mappings. Create the index in advance with the `create_index!`
-          method, so your index configuration is respected.
-
-```ruby
-class Article
-  settings index: { number_of_shards: 1 } do
-    mappings dynamic: 'false' do
-      indexes :title, analyzer: 'english', index_options: 'offsets'
-    end
-  end
-end
-
-Article.mappings.to_hash
-# => {
-#      :article => {
-#        :dynamic => "false",
-#        :properties => {
-#          :title => {
-#            :type          => "string",
-#            :analyzer      => "english",
-#            :index_options => "offsets"
-#          }
-#        }
-#      }
-#    }
-
-Article.settings.to_hash
-# { :index => { :number_of_shards => 1 } }
-```
-
-You can use the defined settings and mappings to create an index with desired configuration:
-
-```ruby
-Article.__elasticsearch__.client.indices.delete index: Article.index_name rescue nil
-Article.__elasticsearch__.client.indices.create \
-  index: Article.index_name,
-  body: { settings: Article.settings.to_hash, mappings: Article.mappings.to_hash }
-```
-
-There's a shortcut available for this common operation (convenient e.g. in tests):
-
-```ruby
-Article.__elasticsearch__.create_index! force: true
-Article.__elasticsearch__.refresh_index!
-```
-
-By default, index name and document type will be inferred from your class name,
-you can set it explicitly, however:
-
-```ruby
-class Article
-  index_name    "articles-#{Rails.env}"
-  document_type "post"
-end
-```
-
-### Updating the Documents in the Index
-
-Usually, we need to update the Elasticsearch index when records in the database are created, updated or deleted;
-use the `index_document`, `update_document` and `delete_document` methods, respectively:
-
-```ruby
-Article.first.__elasticsearch__.index_document
-# => {"ok"=>true, ... "_version"=>2}
-```
-
-#### Automatic Callbacks
-
-You can automatically update the index whenever the record changes, by including
-the `Elasticsearch::Model::Callbacks` module in your model:
-
-```ruby
-class Article
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-end
-
-Article.first.update_attribute :title, 'Updated!'
-
-Article.search('*').map { |r| r.title }
-# => ["Updated!", "Lime green frogs", "Fast black dogs"]
-```
-
-The automatic callback on record update keeps track of changes in your model
-(via [`ActiveModel::Dirty`](http://api.rubyonrails.org/classes/ActiveModel/Dirty.html)-compliant implementation),
-and performs a _partial update_ when this support is available.
-
-The automatic callbacks are implemented in database adapters coming with `Elasticsearch::Model`. You can easily
-implement your own adapter: please see the relevant chapter below.
-
-#### Custom Callbacks
-
-In case you would need more control of the indexing process, you can implement these callbacks yourself,
-by hooking into `after_create`, `after_save`, `after_update` or `after_destroy` operations:
-
-```ruby
-class Article
-  include Elasticsearch::Model
-
-  after_save    { logger.debug ["Updating document... ", index_document ].join }
-  after_destroy { logger.debug ["Deleting document... ", delete_document].join }
-end
-```
-
-For ActiveRecord-based models, use the `after_commit` callback to protect
-your data against inconsistencies caused by transaction rollbacks:
-
-```ruby
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  after_commit on: [:create] do
-    __elasticsearch__.index_document if self.published?
-  end
-
-  after_commit on: [:update] do
-    __elasticsearch__.update_document if self.published?
-  end
-
-  after_commit on: [:destroy] do
-    __elasticsearch__.delete_document if self.published?
-  end
-end
-```
-
-#### Asynchronous Callbacks
-
-Of course, you're still performing an HTTP request during your database transaction, which is not optimal
-for large-scale applications. A better option would be to process the index operations in background,
-with a tool like [_Resque_](https://github.com/resque/resque) or [_Sidekiq_](https://github.com/mperham/sidekiq):
-
-```ruby
-class Article
-  include Elasticsearch::Model
-
-  after_save    { Indexer.perform_async(:index,  self.id) }
-  after_destroy { Indexer.perform_async(:delete, self.id) }
-end
-```
-
-An example implementation of the `Indexer` worker class could look like this:
-
-```ruby
-class Indexer
-  include Sidekiq::Worker
-  sidekiq_options queue: 'elasticsearch', retry: false
-
-  Logger = Sidekiq.logger.level == Logger::DEBUG ? Sidekiq.logger : nil
-  Client = Elasticsearch::Client.new host: 'localhost:9200', logger: Logger
-
-  def perform(operation, record_id)
-    logger.debug [operation, "ID: #{record_id}"]
-
-    case operation.to_s
-      when /index/
-        record = Article.find(record_id)
-        Client.index  index: 'articles', type: 'article', id: record.id, body: record.__elasticsearch__.as_indexed_json
-      when /delete/
-        Client.delete index: 'articles', type: 'article', id: record_id
-      else raise ArgumentError, "Unknown operation '#{operation}'"
-    end
-  end
-end
-```
-
-Start the _Sidekiq_ workers with `bundle exec sidekiq --queue elasticsearch --verbose` and
-update a model:
-
-```ruby
-Article.first.update_attribute :title, 'Updated'
-```
-
-You'll see the job being processed in the console where you started the _Sidekiq_ worker:
-
-```
-Indexer JID-eb7e2daf389a1e5e83697128 DEBUG: ["index", "ID: 7"]
-Indexer JID-eb7e2daf389a1e5e83697128 INFO: PUT http://localhost:9200/articles/article/1 [status:200, request:0.004s, query:n/a]
-Indexer JID-eb7e2daf389a1e5e83697128 DEBUG: > {"id":1,"title":"Updated", ...}
-Indexer JID-eb7e2daf389a1e5e83697128 DEBUG: < {"ok":true,"_index":"articles","_type":"article","_id":"1","_version":6}
-Indexer JID-eb7e2daf389a1e5e83697128 INFO: done: 0.006 sec
-```
-
-### Model Serialization
-
-By default, the model instance will be serialized to JSON using the `as_indexed_json` method,
-which is defined automatically by the `Elasticsearch::Model::Serializing` module:
-
-```ruby
-Article.first.__elasticsearch__.as_indexed_json
-# => {"id"=>1, "title"=>"Quick brown fox"}
-```
-
-If you want to customize the serialization, just implement the `as_indexed_json` method yourself,
-for instance with the [`as_json`](http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html#method-i-as_json) method:
-
-```ruby
-class Article
-  include Elasticsearch::Model
-
-  def as_indexed_json(options={})
-    as_json(only: 'title')
-  end
-end
-
-Article.first.as_indexed_json
-# => {"title"=>"Quick brown fox"}
-```
-
-The re-defined method will be used in the indexing methods, such as `index_document`.
-
-Please note that in Rails 3, you need to either set `include_root_in_json: false`, or prevent adding
-the "root" in the JSON representation with other means.
-
-#### Relationships and Associations
-
-When you have a more complicated structure/schema, you need to customize the `as_indexed_json` method -
-or perform the indexing separately, on your own.
-For example, let's have an `Article` model, which _has_many_ `Comment`s,
-`Author`s and `Categories`. We might want to define the serialization like this:
-
-```ruby
-def as_indexed_json(options={})
-  self.as_json(
-    include: { categories: { only: :title},
-               authors:    { methods: [:full_name], only: [:full_name] },
-               comments:   { only: :text }
-             })
-end
-
-Article.first.as_indexed_json
-# => { "id"         => 1,
-#      "title"      => "First Article",
-#      "created_at" => 2013-12-03 13:39:02 UTC,
-#      "updated_at" => 2013-12-03 13:39:02 UTC,
-#      "categories" => [ { "title" => "One" } ],
-#      "authors"    => [ { "full_name" => "John Smith" } ],
-#      "comments"   => [ { "text" => "First comment" } ] }
-```
-
-Of course, when you want to use the automatic indexing callbacks, you need to hook into the appropriate
-_ActiveRecord_ callbacks -- please see the full example in `examples/activerecord_associations.rb`.
-
-### Other ActiveModel Frameworks
-
-The `Elasticsearch::Model` module is fully compatible with any ActiveModel-compatible model, such as _Mongoid_:
-
-```ruby
-require 'mongoid'
-
-Mongoid.connect_to 'articles'
-
-class Article
-  include Mongoid::Document
-
-  field :id,    type: String
-  field :title, type: String
-
-  attr_accessible :id, :title, :published_at
-
-  include Elasticsearch::Model
-
-  def as_indexed_json(options={})
-    as_json(except: [:id, :_id])
-  end
-end
-
-Article.create id: '1', title: 'Quick brown fox'
-Article.import
-
-response = Article.search 'fox';
-response.records.to_a
-#  MOPED: 127.0.0.1:27017 QUERY        database=articles collection=articles selector={"_id"=>{"$in"=>["1"]}} ...
-# => [#<Article _id: 1, id: nil, title: "Quick brown fox", published_at: nil>]
-```
-
-Full examples for CouchBase, DataMapper, Mongoid, Ohm and Riak models can be found in the `examples` folder.
-
-### Adapters
-
-To support various "OxM" (object-relational- or object-document-mapper) implementations and frameworks,
-the `Elasticsearch::Model` integration supports an "adapter" concept.
-
-An adapter provides implementations for common behaviour, such as fetching records from the database,
-hooking into model callbacks for automatic index updates, or efficient bulk loading from the database.
-The integration comes with adapters for _ActiveRecord_ and _Mongoid_ out of the box.
-
-Writing an adapter for your favourite framework is straightforward -- let's see
-a simplified adapter for [_DataMapper_](http://datamapper.org):
-
-```ruby
-module DataMapperAdapter
-
-  # Implement the interface for fetching records
-  #
-  module Records
-    def records
-      klass.all(id: ids)
-    end
-
-    # ...
-  end
-end
-
-# Register the adapter
-#
-Elasticsearch::Model::Adapter.register(
-  DataMapperAdapter,
-  lambda { |klass| defined?(::DataMapper::Resource) and klass.ancestors.include?(::DataMapper::Resource) }
-)
-```
-
-Require the adapter and include `Elasticsearch::Model` in the class:
-
-```ruby
-require 'datamapper_adapter'
-
-class Article
-  include DataMapper::Resource
-  include Elasticsearch::Model
-
-  property :id,    Serial
-  property :title, String
-end
-```
-
-When accessing the `records` method of the response, for example,
-the implementation from our adapter will be used now:
-
-```ruby
-response = Article.search 'foo'
-
-response.records.to_a
-# ~  (0.000057) SELECT "id", "title", "published_at" FROM "articles" WHERE "id" IN (3, 1) ORDER BY "id"
-# => [#<Article @id=1 @title="Foo" @published_at=nil>, #<Article @id=3 @title="Foo Foo" @published_at=nil>]
-
-response.records.records.class
-# => DataMapper::Collection
-```
-
-More examples can be found in the `examples` folder. Please see the `Elasticsearch::Model::Adapter`
-module and its submodules for technical information.
-
-### Settings
-
-The module provides a common `settings` method to customize various features.
-
-Before version 7.0.0 of the gem, the only supported setting was `:inheritance_enabled`. This setting has been deprecated
-and removed.
-
-## Development and Community
-
-For local development, clone the repository and run `bundle install`. See `rake -T` for a list of
-available Rake tasks for running tests, generating documentation, starting a testing cluster, etc.
-
-Bug fixes and features must be covered by unit tests.
-
-Github's pull requests and issues are used to communicate, send bug reports and code contributions.
-
-To run all tests against a test Elasticsearch cluster, use a command like this:
-
-```bash
-curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.0.RC1.tar.gz | tar xz -C tmp/
-SERVER=start TEST_CLUSTER_COMMAND=$PWD/tmp/elasticsearch-1.0.0.RC1/bin/elasticsearch bundle exec rake test:all
-```
-
-### Single Table Inheritance deprecation
-
-`Single Table Inheritance` has been supported through the 6.x series of this gem. With this feature,
-elasticsearch settings (index mappings, etc) on a parent model could be inherited by a child model leading to different 
-model documents being indexed into the same Elasticsearch index. This feature depended on the ability to set a `type` 
-for a document in Elasticsearch. The Elasticsearch team has deprecated support for `types`, as is described 
-[here.](https://www.elastic.co/guide/en/elasticsearch/reference/current/removal-of-types.html)
-This gem will also remove support for types and `Single Table Inheritance` in version 7.0 as it enables an anti-pattern. 
-Please save different model documents in separate indices. If you want to use STI, you can include an artificial 
-`type` field manually in each document and use it in other operations.
-
-## License
-
-This software is licensed under the Apache 2 license, quoted below.
-
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/elasticsearch-rails/elasticsearch-model/Rakefile b/elasticsearch-rails/elasticsearch-model/Rakefile
deleted file mode 100644
index 6969c1d4ae..0000000000
--- a/elasticsearch-rails/elasticsearch-model/Rakefile
+++ /dev/null
@@ -1,61 +0,0 @@
-require "bundler/gem_tasks"
-
-desc "Run unit tests"
-task :default => 'test:unit'
-task :test    => 'test:unit'
-
-if RUBY_VERSION < '2.3'
-  GEMFILES = ['3.0.gemfile', '4.0.gemfile', '5.0.gemfile']
-else
-  GEMFILES = ['4.0.gemfile', '5.0.gemfile']
-end
-
-namespace :bundle do
-  desc 'Install dependencies for all the Gemfiles in /gemfiles. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
-  task :install do
-    unless defined?(JRUBY_VERSION)
-      puts '-'*80
-      gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map { |v| "#{v}.gemfile"} : GEMFILES
-      gemfiles.each do |gemfile|
-        Bundler.with_clean_env do
-          sh "bundle install --gemfile #{File.expand_path('../gemfiles/'+gemfile, __FILE__)}"
-        end
-        puts '-'*80
-      end
-    end
-  end
-end
-
-# ----- Test tasks ------------------------------------------------------------
-
-require 'rake/testtask'
-namespace :test do
-
-  desc 'Run all tests. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
-  task :all, [:rails_versions] do |task, args|
-    gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map {|v| "#{v}.gemfile"} : GEMFILES
-    puts '-' * 80
-    gemfiles.each do |gemfile|
-      sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " +
-             " bundle exec rspec"
-      puts '-' * 80
-    end
-  end
-end
-
-# ----- Documentation tasks ---------------------------------------------------
-
-require 'yard'
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.options = %w| --embed-mixins --markup=markdown |
-end
-
-# ----- Code analysis tasks ---------------------------------------------------
-
-if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-  require 'cane/rake_task'
-  Cane::RakeTask.new(:quality) do |cane|
-    cane.abc_max = 15
-    cane.no_style = true
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/elasticsearch-model.gemspec b/elasticsearch-rails/elasticsearch-model/elasticsearch-model.gemspec
deleted file mode 100644
index ca57aab757..0000000000
--- a/elasticsearch-rails/elasticsearch-model/elasticsearch-model.gemspec
+++ /dev/null
@@ -1,54 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'elasticsearch/model/version'
-
-Gem::Specification.new do |s|
-  s.name          = "elasticsearch-model"
-  s.version       = Elasticsearch::Model::VERSION
-  s.authors       = ["Karel Minarik"]
-  s.email         = ["karel.minarik@elasticsearch.org"]
-  s.description   = "ActiveModel/Record integrations for Elasticsearch."
-  s.summary       = "ActiveModel/Record integrations for Elasticsearch."
-  s.homepage      = "https://github.com/elasticsearch/elasticsearch-rails/"
-  s.license       = "Apache 2"
-
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
-  s.rdoc_options      = [ "--charset=UTF-8" ]
-
-  s.required_ruby_version = ">= 1.9.3"
-
-  s.add_dependency "elasticsearch",       '> 1'
-  s.add_dependency "activesupport",       '> 3'
-  s.add_dependency "hashie"
-
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 11.1"
-
-  s.add_development_dependency "elasticsearch-extensions"
-
-  s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "activemodel",   "> 3"
-
-  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "kaminari"
-  s.add_development_dependency "will_paginate"
-
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda-context"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "pry"
-
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "cane"
-  s.add_development_dependency "require-prof"
-end
diff --git a/elasticsearch-rails/elasticsearch-model/examples/activerecord_article.rb b/elasticsearch-rails/elasticsearch-model/examples/activerecord_article.rb
deleted file mode 100644
index 428c4dcc14..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/activerecord_article.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# ActiveRecord and Elasticsearch
-# ==============================
-#
-# https://github.com/rails/rails/tree/master/activerecord
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'logger'
-require 'ansi/core'
-require 'active_record'
-require 'kaminari'
-
-require 'elasticsearch/model'
-
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-
-ActiveRecord::Schema.define(version: 1) do
-  create_table :articles do |t|
-    t.string :title
-    t.date    :published_at
-    t.timestamps
-  end
-end
-
-Kaminari::Hooks.init if defined?(Kaminari::Hooks) if defined?(Kaminari::Hooks)
-
-class Article < ActiveRecord::Base
-end
-
-# Store data
-#
-Article.delete_all
-Article.create title: 'Foo'
-Article.create title: 'Bar'
-Article.create title: 'Foo Foo'
-
-# Index data
-#
-client = Elasticsearch::Client.new log:true
-
-# client.indices.delete index: 'articles' rescue nil
-# client.indices.create index: 'articles', body: { mappings: { article: { dynamic: 'strict' }, properties: {} } }
-
-client.indices.delete index: 'articles' rescue nil
-client.bulk index: 'articles',
-            type:  'article',
-            body:  Article.all.as_json.map { |a| { index: { _id: a.delete('id'), data: a } } },
-            refresh: true
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :include, Elasticsearch::Model
-# Article.__send__ :include, Elasticsearch::Model::Callbacks
-
-# ActiveRecord::Base.logger.silence do
-#   10_000.times do |i|
-#     Article.create title: "Foo #{i}"
-#   end
-# end
-
-puts '', '-'*Pry::Terminal.width!
-
-Elasticsearch::Model.client = Elasticsearch::Client.new log: true
-
-response = Article.search 'foo';
-
-p response.size
-p response.results.size
-p response.records.size
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/activerecord_associations.rb b/elasticsearch-rails/elasticsearch-model/examples/activerecord_associations.rb
deleted file mode 100644
index b086283a01..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/activerecord_associations.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# ActiveRecord associations and Elasticsearch
-# ===========================================
-#
-# https://github.com/rails/rails/tree/master/activerecord
-# http://guides.rubyonrails.org/association_basics.html
-#
-# Run me with:
-#
-#     ruby -I lib examples/activerecord_associations.rb
-#
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-
-require 'logger'
-require 'ansi/core'
-require 'active_record'
-
-require 'json'
-require 'elasticsearch/model'
-
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-
-# ----- Schema definition -------------------------------------------------------------------------
-
-ActiveRecord::Schema.define(version: 1) do
-  create_table :categories do |t|
-    t.string     :title
-    t.timestamps null: false
-  end
-
-  create_table :authors do |t|
-    t.string     :first_name, :last_name
-    t.string     :department
-    t.timestamps null: false
-  end
-
-  create_table :authorships do |t|
-    t.references :article
-    t.references :author
-    t.timestamps null: false
-  end
-
-  create_table :articles do |t|
-    t.string   :title
-    t.timestamps null: false
-  end
-
-  create_table :articles_categories, id: false do |t|
-    t.references :article, :category
-  end
-
-  create_table :comments do |t|
-    t.string     :text
-    t.references :article
-    t.timestamps null: false
-  end
-
-  add_index(:comments, :article_id) unless index_exists?(:comments, :article_id)
-end
-
-# ----- Elasticsearch client setup ----------------------------------------------------------------
-
-Elasticsearch::Model.client = Elasticsearch::Client.new log: true
-Elasticsearch::Model.client.transport.logger.formatter = proc { |s, d, p, m| "\e[2m#{m}\n\e[0m" }
-
-# ----- Search integration ------------------------------------------------------------------------
-
-module Searchable
-  extend ActiveSupport::Concern
-
-  included do
-    include Elasticsearch::Model
-    include Elasticsearch::Model::Callbacks
-
-    include Indexing
-    after_touch() { __elasticsearch__.index_document }
-  end
-
-  module Indexing
-
-    # Customize the JSON serialization for Elasticsearch
-    def as_indexed_json(options={})
-      self.as_json(
-        include: { categories: { only: :title},
-                   authors:    { methods: [:full_name, :department], only: [:full_name, :department] },
-                   comments:   { only: :text }
-                 })
-    end
-  end
-end
-
-# ----- Model definitions -------------------------------------------------------------------------
-
-class Category < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  has_and_belongs_to_many :articles
-end
-
-class Author < ActiveRecord::Base
-  has_many :authorships
-
-  after_update { self.authorships.each(&:touch) }
-
-  def full_name
-    [first_name, last_name].compact.join(' ')
-  end
-end
-
-class Authorship < ActiveRecord::Base
-  belongs_to :author
-  belongs_to :article, touch: true
-end
-
-class Article < ActiveRecord::Base
-  include Searchable
-
-  has_and_belongs_to_many :categories, after_add:    [ lambda { |a,c| a.__elasticsearch__.index_document } ],
-                                       after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
-  has_many                :authorships
-  has_many                :authors, through: :authorships
-  has_many                :comments
-end
-
-class Comment < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  belongs_to :article, touch: true
-end
-
-# ----- Insert data -------------------------------------------------------------------------------
-
-# Create category
-#
-category = Category.create title: 'One'
-
-# Create author
-#
-author = Author.create first_name: 'John', last_name: 'Smith', department: 'Business'
-
-# Create article
-
-article  = Article.create title: 'First Article'
-
-# Assign category
-#
-article.categories << category
-
-# Assign author
-#
-article.authors << author
-
-# Add comment
-#
-article.comments.create text: 'First comment for article One'
-article.comments.create text: 'Second comment for article One'
-
-Elasticsearch::Model.client.indices.refresh index: Elasticsearch::Model::Registry.all.map(&:index_name)
-
-# Search for a term and return records
-#
-puts "",
-     "Articles containing 'one':".ansi(:bold),
-     Article.search('one').records.to_a.map(&:inspect),
-     ""
-
-puts "",
-     "All Models containing 'one':".ansi(:bold),
-     Elasticsearch::Model.search('one').records.to_a.map(&:inspect),
-     ""
-
-# Difference between `records` and `results`
-#
-response = Article.search query: { match: { title: 'first' } }
-
-puts "",
-     "Search results are wrapped in the <#{response.class}> class",
-     ""
-
-puts "",
-     "Access the <ActiveRecord> instances with the `#records` method:".ansi(:bold),
-     response.records.map { |r| "* #{r.title} | Authors: #{r.authors.map(&:full_name) } | Comment count: #{r.comments.size}" }.join("\n"),
-     ""
-
-puts "",
-     "Access the Elasticsearch documents with the `#results` method (without touching the database):".ansi(:bold),
-     response.results.map { |r| "* #{r.title} | Authors: #{r.authors.map(&:full_name) } | Comment count: #{r.comments.size}" }.join("\n"),
-     ""
-
-puts "",
-     "The whole indexed document (according to `Article#as_indexed_json`):".ansi(:bold),
-     JSON.pretty_generate(response.results.first._source.to_hash),
-     ""
-
-# Retrieve only selected fields from Elasticsearch
-#
-response = Article.search query: { match: { title: 'first' } }, _source: ['title', 'authors.full_name']
-
-puts "",
-     "Retrieve only selected fields from Elasticsearch:".ansi(:bold),
-     JSON.pretty_generate(response.results.first._source.to_hash),
-     ""
-
-# ----- Pry ---------------------------------------------------------------------------------------
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.first'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/activerecord_custom_analyzer.rb b/elasticsearch-rails/elasticsearch-model/examples/activerecord_custom_analyzer.rb
deleted file mode 100644
index 07371508a1..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/activerecord_custom_analyzer.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# Custom Analyzer for ActiveRecord integration with Elasticsearch
-# ===============================================================
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'ansi'
-require 'logger'
-
-require 'active_record'
-require 'elasticsearch/model'
-
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-
-ActiveRecord::Schema.define(version: 1) do
-  create_table :articles do |t|
-    t.string :title
-    t.date    :published_at
-    t.timestamps
-  end
-end
-
-Elasticsearch::Model.client.transport.logger = ActiveSupport::Logger.new(STDOUT)
-Elasticsearch::Model.client.transport.logger.formatter = lambda { |s, d, p, m| "#{m.ansi(:faint)}\n" }
-
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  settings index: {
-    number_of_shards: 1,
-    number_of_replicas: 0,
-    analysis: {
-      analyzer: {
-        pattern: {
-          type: 'pattern',
-          pattern: "\\s|_|-|\\.",
-          lowercase: true
-        },
-        trigram: {
-          tokenizer: 'trigram'
-        }
-      },
-      tokenizer: {
-        trigram: {
-          type: 'ngram',
-          min_gram: 3,
-          max_gram: 3,
-          token_chars: ['letter', 'digit']
-        }
-      }
-    } } do
-    mapping do
-      indexes :title, type: 'text', analyzer: 'english' do
-        indexes :keyword, analyzer: 'keyword'
-        indexes :pattern, analyzer: 'pattern'
-        indexes :trigram, analyzer: 'trigram'
-      end
-    end
-  end
-end
-
-# Create example records
-#
-Article.delete_all
-Article.create title: 'Foo'
-Article.create title: 'Foo-Bar'
-Article.create title: 'Foo_Bar_Bazooka'
-Article.create title: 'Foo.Bar'
-
-# Index records
-#
-errors = Article.import force: true, refresh: true, return: 'errors'
-puts "[!] Errors importing records: #{errors.map { |d| d['index']['error'] }.join(', ')}".ansi(:red) && exit(1) unless errors.empty?
-
-puts '', '-'*80
-
-puts "English analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
-     "Tokens: " +
-     Article.__elasticsearch__.client.indices
-      .analyze(index: Article.index_name, body: { field: 'title', text: 'Foo_Bar_1_Bazooka' })['tokens']
-      .map { |d| "[#{d['token']}]" }.join(' '),
-    "\n"
-
-puts "Keyword analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
-     "Tokens: " +
-     Article.__elasticsearch__.client.indices
-      .analyze(index: Article.index_name, body: { field: 'title.keyword', text: 'Foo_Bar_1_Bazooka' })['tokens']
-      .map { |d| "[#{d['token']}]" }.join(' '),
-     "\n"
-
-puts "Pattern analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
-     "Tokens: " +
-     Article.__elasticsearch__.client.indices
-      .analyze(index: Article.index_name, body: { field: 'title.pattern', text: 'Foo_Bar_1_Bazooka' })['tokens']
-      .map { |d| "[#{d['token']}]" }.join(' '),
-     "\n"
-
-puts "Trigram analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
-     "Tokens: " +
-     Article.__elasticsearch__.client.indices
-      .analyze(index: Article.index_name, body: { field: 'title.trigram', text: 'Foo_Bar_1_Bazooka' })['tokens']
-      .map { |d| "[#{d['token']}]" }.join(' '),
-     "\n"
-
-puts '', '-'*80
-
-response = Article.search query: { match: { 'title' => 'foo' } } ;
-
-puts "English search for 'foo'".ansi(:bold),
-     "#{response.response.hits.total} matches: " +
-     response.records.map { |d| d.title }.join(', '),
-     "\n"
-
-puts '', '-'*80
-
-response = Article.search query: { match: { 'title.pattern' => 'foo' } } ;
-
-puts "Pattern search for 'foo'".ansi(:bold),
-     "#{response.response.hits.total} matches: " +
-     response.records.map { |d| d.title }.join(', '),
-     "\n"
-
-puts '', '-'*80
-
-response = Article.search query: { match: { 'title.trigram' => 'zoo' } } ;
-
-puts "Trigram search for 'zoo'".ansi(:bold),
-     "#{response.response.hits.total} matches: " +
-     response.records.map { |d| d.title }.join(', '),
-     "\n"
-
-puts '', '-'*80
-
-
-require 'pry'; binding.pry;
diff --git a/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_completion.rb b/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_completion.rb
deleted file mode 100644
index d153905254..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_completion.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'ansi'
-require 'active_record'
-require 'elasticsearch/model'
-
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-
-ActiveRecord::Schema.define(version: 1) do
-  create_table :articles do |t|
-    t.string :title
-    t.date   :published_at
-    t.timestamps
-  end
-end
-
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  mapping do
-    indexes :title, type: 'text' do
-      indexes :suggest, type: 'completion'
-    end
-    indexes :url, type: 'keyword'
-  end
-
-  def as_indexed_json(options={})
-    as_json.merge 'url' => "/articles/#{id}"
-  end
-end
-
-Article.__elasticsearch__.client = Elasticsearch::Client.new log: true
-
-# Create index
-
-Article.__elasticsearch__.create_index! force: true
-
-# Store data
-
-Article.delete_all
-Article.create title: 'Foo'
-Article.create title: 'Bar'
-Article.create title: 'Foo Foo'
-Article.__elasticsearch__.refresh_index!
-
-# Search and suggest
-
-response_1 = Article.search 'foo';
-
-puts "Article search:".ansi(:bold),
-     response_1.to_a.map { |d| "Title: #{d.title}" }.inspect.ansi(:bold, :yellow)
-
-response_2 = Article.search \
-  query: {
-    match: { title: 'foo' }
-  },
-  suggest: {
-    articles: {
-      text: 'foo',
-      completion: { field: 'title.suggest' }
-    }
-  },
-  _source: ['title', 'url']
-
-puts "Article search with suggest:".ansi(:bold),
-     response_2.response['suggest']['articles'].first['options'].map { |d| "#{d['text']} -> #{d['_source']['url']}" }.
-     inspect.ansi(:bold, :blue)
-
-require 'pry'; binding.pry;
diff --git a/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_edge_ngram.rb b/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_edge_ngram.rb
deleted file mode 100644
index 7a6a1e8c66..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/activerecord_mapping_edge_ngram.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'ansi'
-require 'sqlite3'
-require 'active_record'
-require 'elasticsearch/model'
-
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
-ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
-
-ActiveRecord::Schema.define(version: 1) do
-  create_table :articles do |t|
-    t.string :title
-    t.date   :published_at
-    t.timestamps
-  end
-end
-
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  article_es_settings = {
-    index: {
-      analysis: {
-        filter: {
-          autocomplete_filter: {
-            type: "edge_ngram",
-            min_gram: 1,
-            max_gram: 20
-          }
-        },
-        analyzer:{
-          autocomplete: {
-            type: "custom",
-            tokenizer: "standard",
-            filter: ["lowercase", "autocomplete_filter"]
-          }
-        }
-      }
-    }
-  }
-
-  settings article_es_settings do
-    mapping do
-      indexes :title
-      indexes :suggestable_title, type: 'string', analyzer: 'autocomplete'
-    end
-  end
-
-  def as_indexed_json(options={})
-    as_json.merge(suggestable_title: title)
-  end
-end
-
-Article.__elasticsearch__.client = Elasticsearch::Client.new log: true
-
-# Create index
-
-Article.__elasticsearch__.create_index! force: true
-
-# Store data
-
-Article.delete_all
-Article.create title: 'Foo'
-Article.create title: 'Bar'
-Article.create title: 'Foo Foo'
-Article.__elasticsearch__.refresh_index!
-
-# Search and suggest
-fulltext_search_response = Article.search(query: { match: { title: 'foo'} } )
-
-puts "", "Article search for 'foo':".ansi(:bold),
-     fulltext_search_response.to_a.map { |d| "Title: #{d.title}" }.inspect.ansi(:bold, :yellow),
-     ""
-
-fulltext_search_response_2 = Article.search(query: { match: { title: 'fo'} } )
-
-puts "", "Article search for 'fo':".ansi(:bold),
-     fulltext_search_response_2.to_a.map { |d| "Title: #{d.title}" }.inspect.ansi(:bold, :red),
-     ""
-
-autocomplete_search_response = Article.search(query: { match: { suggestable_title: { query: 'fo', analyzer: 'standard'} } } )
-
-puts "", "Article autocomplete for 'fo':".ansi(:bold),
-     autocomplete_search_response.to_a.map { |d| "Title: #{d.suggestable_title}" }.inspect.ansi(:bold, :green),
-     ""
-
-puts "", "Text 'Foo Bar' analyzed with the default analyzer:".ansi(:bold),
-     Article.__elasticsearch__.client.indices.analyze(
-      index: Article.__elasticsearch__.index_name,
-      field: 'title',
-      text: 'Foo Bar')['tokens'].map { |t| t['token'] }.inspect.ansi(:bold, :yellow),
-     ""
-
-puts "", "Text 'Foo Bar' analyzed with the autocomplete filter:".ansi(:bold),
-     Article.__elasticsearch__.client.indices.analyze(
-      index: Article.__elasticsearch__.index_name,
-      field: 'suggestable_title',
-      text: 'Foo Bar')['tokens'].map { |t| t['token'] }.inspect.ansi(:bold, :yellow),
-     ""
-
-require 'pry'; binding.pry;
diff --git a/elasticsearch-rails/elasticsearch-model/examples/couchbase_article.rb b/elasticsearch-rails/elasticsearch-model/examples/couchbase_article.rb
deleted file mode 100644
index 57cc421b01..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/couchbase_article.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# Couchbase and Elasticsearch
-# ===========================
-#
-# https://github.com/couchbase/couchbase-ruby-model
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'logger'
-require 'couchbase/model'
-
-require 'elasticsearch/model'
-
-# Documents are stored as JSON objects in Riak but have rich
-# semantics, including validations and associations.
-class Article < Couchbase::Model
-  attribute :title
-  attribute :published_at
-
-  # view :all, :limit => 10, :descending => true
-  # TODO: Implement view a la
-  # bucket.save_design_doc <<-JSON
-  #   {
-  #   "_id": "_design/article",
-  #   "language": "javascript",
-  #   "views": {
-  #     "all": {
-  #       "map": "function(doc, meta) { emit(doc.id, doc.title); }"
-  #     }
-  #   }
-  # }
-  # JSON
-
-end
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :extend, Elasticsearch::Model::Client::ClassMethods
-Article.__send__ :extend, Elasticsearch::Model::Searching::ClassMethods
-Article.__send__ :extend, Elasticsearch::Model::Naming::ClassMethods
-
-# Create documents in Riak
-#
-Article.create id: '1', title: 'Foo'      rescue nil
-Article.create id: '2', title: 'Bar'      rescue nil
-Article.create id: '3', title: 'Foo Foo'  rescue nil
-
-# Index data into Elasticsearch
-#
-client = Elasticsearch::Client.new log:true
-
-client.indices.delete index: 'articles' rescue nil
-client.bulk index: 'articles',
-            type:  'article',
-            body:  Article.find(['1', '2', '3']).map { |a|
-                     { index: { _id: a.id, data: a.attributes } }
-                   },
-            refresh: true
-
-response = Article.search 'foo', index: 'articles', type: 'article';
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/datamapper_article.rb b/elasticsearch-rails/elasticsearch-model/examples/datamapper_article.rb
deleted file mode 100644
index 291df7d3da..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/datamapper_article.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# DataMapper and Elasticsearch
-# ============================
-#
-# https://github.com/datamapper/dm-core
-# https://github.com/datamapper/dm-active_model
-
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'logger'
-require 'ansi/core'
-
-require 'data_mapper'
-require 'dm-active_model'
-
-require 'active_support/all'
-
-require 'elasticsearch/model'
-
-DataMapper::Logger.new(STDOUT, :debug)
-DataMapper.setup(:default, 'sqlite::memory:')
-
-class Article
-  include DataMapper::Resource
-
-  property :id,           Serial
-  property :title,        String
-  property :published_at, DateTime
-end
-
-DataMapper.auto_migrate!
-DataMapper.finalize
-
-Article.create title: 'Foo'
-Article.create title: 'Bar'
-Article.create title: 'Foo Foo'
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :include, Elasticsearch::Model
-
-# The DataMapper adapter
-#
-module DataMapperAdapter
-
-  # Implement the interface for fetching records
-  #
-  module Records
-    def records
-      klass.all(id: ids)
-    end
-
-    # ...
-  end
-
-  module Callbacks
-    def self.included(model)
-      model.class_eval do
-        after(:create) { __elasticsearch__.index_document  }
-        after(:save) { __elasticsearch__.update_document }
-        after(:destroy) { __elasticsearch__.delete_document }
-      end
-    end
-  end
-end
-
-# Register the adapter
-#
-Elasticsearch::Model::Adapter.register(
-  DataMapperAdapter,
-  lambda { |klass| defined?(::DataMapper::Resource) and klass.ancestors.include?(::DataMapper::Resource) }
-)
-
-response = Article.search 'foo';
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/mongoid_article.rb b/elasticsearch-rails/elasticsearch-model/examples/mongoid_article.rb
deleted file mode 100644
index 5cd12ca4fa..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/mongoid_article.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# Mongoid and Elasticsearch
-# =========================
-#
-# http://mongoid.org/en/mongoid/index.html
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'benchmark'
-require 'logger'
-require 'ansi/core'
-require 'mongoid'
-
-require 'elasticsearch/model'
-require 'elasticsearch/model/callbacks'
-
-Mongoid.logger.level = Logger::DEBUG
-Moped.logger.level = Logger::DEBUG
-
-Mongoid.connect_to 'articles'
-
-Elasticsearch::Model.client = Elasticsearch::Client.new host: 'localhost:9200', log: true
-
-class Article
-  include Mongoid::Document
-  field :id, type: String
-  field :title, type: String
-  field :published_at, type: DateTime
-  attr_accessible :id, :title, :published_at if respond_to? :attr_accessible
-
-  def as_indexed_json(options={})
-    as_json(except: [:id, :_id])
-  end
-end
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :include, Elasticsearch::Model
-# Article.__send__ :include, Elasticsearch::Model::Callbacks
-
-# Store data
-#
-Article.delete_all
-Article.create id: '1', title: 'Foo'
-Article.create id: '2', title: 'Bar'
-Article.create id: '3', title: 'Foo Foo'
-
-# Index data
-#
-client = Elasticsearch::Client.new host:'localhost:9200', log:true
-
-client.indices.delete index: 'articles' rescue nil
-client.bulk index: 'articles',
-            type:  'article',
-            body:  Article.all.map { |a| { index: { _id: a.id, data: a.attributes } } },
-            refresh: true
-
-# puts Benchmark.realtime { 9_875.times { |i| Article.create title: "Foo #{i}" } }
-
-puts '', '-'*Pry::Terminal.width!
-
-response = Article.search 'foo';
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/ohm_article.rb b/elasticsearch-rails/elasticsearch-model/examples/ohm_article.rb
deleted file mode 100644
index 3145085e79..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/ohm_article.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# Ohm for Redis and Elasticsearch
-# ===============================
-#
-# https://github.com/soveran/ohm#example
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'logger'
-require 'ansi/core'
-require 'active_model'
-require 'ohm'
-
-require 'elasticsearch/model'
-
-class Article < Ohm::Model
-  # Include JSON serialization from ActiveModel
-  include ActiveModel::Serializers::JSON
-
-  attribute :title
-  attribute :published_at
-end
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :include, Elasticsearch::Model
-
-# Register a custom adapter
-#
-module Elasticsearch
-  module Model
-    module Adapter
-      module Ohm
-        Adapter.register self,
-                         lambda { |klass| defined?(::Ohm::Model) and klass.ancestors.include?(::Ohm::Model) }
-        module Records
-          def records
-            klass.fetch(@ids)
-          end
-        end
-      end
-    end
-  end
-end
-
-# Configure the Elasticsearch client to log operations
-#
-Elasticsearch::Model.client = Elasticsearch::Client.new log: true
-
-puts '', '-'*Pry::Terminal.width!
-
-Article.all.map { |a| a.delete }
-Article.create id: '1', title: 'Foo'
-Article.create id: '2', title: 'Bar'
-Article.create id: '3', title: 'Foo Foo'
-
-Article.__elasticsearch__.client.indices.delete index: 'articles' rescue nil
-Article.__elasticsearch__.client.bulk index: 'articles',
-                                      type:  'article',
-                                      body:  Article.all.map { |a| { index: { _id: a.id, data: a.attributes } } },
-                                      refresh: true
-
-
-response = Article.search 'foo', index: 'articles', type: 'article';
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/examples/riak_article.rb b/elasticsearch-rails/elasticsearch-model/examples/riak_article.rb
deleted file mode 100644
index 8013cda7ea..0000000000
--- a/elasticsearch-rails/elasticsearch-model/examples/riak_article.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# Riak and Elasticsearch
-# ======================
-#
-# https://github.com/basho-labs/ripple
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'pry'
-Pry.config.history.file = File.expand_path('../../tmp/elasticsearch_development.pry', __FILE__)
-
-require 'logger'
-require 'ripple'
-
-require 'elasticsearch/model'
-
-# Documents are stored as JSON objects in Riak but have rich
-# semantics, including validations and associations.
-class Article
-  include Ripple::Document
-
-  property :title,        String
-  property :published_at, Time,   :default => proc { Time.now }
-end
-
-# Extend the model with Elasticsearch support
-#
-Article.__send__ :include, Elasticsearch::Model
-
-# Create documents in Riak
-#
-Article.destroy_all
-Article.create id: '1', title: 'Foo'
-Article.create id: '2', title: 'Bar'
-Article.create id: '3', title: 'Foo Foo'
-
-# Index data into Elasticsearch
-#
-client = Elasticsearch::Client.new log:true
-
-client.indices.delete index: 'articles' rescue nil
-client.bulk index: 'articles',
-            type:  'article',
-            body:  Article.all.map { |a|
-                     { index: { _id: a.key, data: JSON.parse(a.robject.raw_data) } }
-                   }.as_json,
-            refresh: true
-
-response = Article.search 'foo';
-
-Pry.start(binding, prompt: lambda { |obj, nest_level, _| '> ' },
-                   input: StringIO.new('response.records.to_a'),
-                   quiet: true)
diff --git a/elasticsearch-rails/elasticsearch-model/gemfiles/3.0.gemfile b/elasticsearch-rails/elasticsearch-model/gemfiles/3.0.gemfile
deleted file mode 100644
index ebb597f639..0000000000
--- a/elasticsearch-rails/elasticsearch-model/gemfiles/3.0.gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activemodel',  '>= 3.0'
-gem 'activerecord', '~> 3.2'
-gem 'mongoid',      '>= 3.0'
-gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
-
-group :development, :testing do
-  gem 'rspec'
-  gem 'pry-nav'
-end
\ No newline at end of file
diff --git a/elasticsearch-rails/elasticsearch-model/gemfiles/4.0.gemfile b/elasticsearch-rails/elasticsearch-model/gemfiles/4.0.gemfile
deleted file mode 100644
index 6837398bbd..0000000000
--- a/elasticsearch-rails/elasticsearch-model/gemfiles/4.0.gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activemodel',  '~> 4'
-gem 'activerecord', '~> 4'
-gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 5'
-
-group :development, :testing do
-  gem 'rspec'
-  gem 'pry-nav'
-end
\ No newline at end of file
diff --git a/elasticsearch-rails/elasticsearch-model/gemfiles/5.0.gemfile b/elasticsearch-rails/elasticsearch-model/gemfiles/5.0.gemfile
deleted file mode 100644
index 612f2bbd90..0000000000
--- a/elasticsearch-rails/elasticsearch-model/gemfiles/5.0.gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activemodel',  '~> 5'
-gem 'activerecord', '~> 5'
-gem 'sqlite3' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 6'
-
-group :development, :testing do
-  gem 'rspec'
-  gem 'pry-nav'
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model.rb
deleted file mode 100644
index 1024669168..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-require 'hashie/mash'
-
-require 'active_support/core_ext/module/delegation'
-
-require 'elasticsearch'
-
-require 'elasticsearch/model/version'
-
-require 'elasticsearch/model/hash_wrapper'
-require 'elasticsearch/model/client'
-
-require 'elasticsearch/model/multimodel'
-
-require 'elasticsearch/model/adapter'
-require 'elasticsearch/model/adapters/default'
-require 'elasticsearch/model/adapters/active_record'
-require 'elasticsearch/model/adapters/mongoid'
-require 'elasticsearch/model/adapters/multiple'
-
-require 'elasticsearch/model/importing'
-require 'elasticsearch/model/indexing'
-require 'elasticsearch/model/naming'
-require 'elasticsearch/model/serializing'
-require 'elasticsearch/model/searching'
-require 'elasticsearch/model/callbacks'
-
-require 'elasticsearch/model/proxy'
-
-require 'elasticsearch/model/response'
-require 'elasticsearch/model/response/base'
-require 'elasticsearch/model/response/result'
-require 'elasticsearch/model/response/results'
-require 'elasticsearch/model/response/records'
-require 'elasticsearch/model/response/pagination'
-require 'elasticsearch/model/response/aggregations'
-require 'elasticsearch/model/response/suggestions'
-
-require 'elasticsearch/model/ext/active_record'
-
-case
-when defined?(::Kaminari)
-  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
-when defined?(::WillPaginate)
-  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::WillPaginate
-end
-
-module Elasticsearch
-
-  # Elasticsearch integration for Ruby models
-  # =========================================
-  #
-  # `Elasticsearch::Model` contains modules for integrating the Elasticsearch search and analytical engine
-  # with ActiveModel-based classes, or models, for the Ruby programming language.
-  #
-  # It facilitates importing your data into an index, automatically updating it when a record changes,
-  # searching the specific index, setting up the index mapping or the model JSON serialization.
-  #
-  # When the `Elasticsearch::Model` module is included in your class, it automatically extends it
-  # with the functionality; see {Elasticsearch::Model.included}. Most methods are available via
-  # the `__elasticsearch__` class and instance method proxies.
-  #
-  # It is possible to include/extend the model with the corresponding
-  # modules directly, if that is desired:
-  #
-  #     MyModel.__send__ :extend,  Elasticsearch::Model::Client::ClassMethods
-  #     MyModel.__send__ :include, Elasticsearch::Model::Client::InstanceMethods
-  #     MyModel.__send__ :extend,  Elasticsearch::Model::Searching::ClassMethods
-  #     # ...
-  #
-  module Model
-    METHODS = [:search, :mapping, :mappings, :settings, :index_name, :document_type, :import]
-
-    # Adds the `Elasticsearch::Model` functionality to the including class.
-    #
-    # * Creates the `__elasticsearch__` class and instance methods, pointing to the proxy object
-    # * Includes the necessary modules in the proxy classes
-    # * Sets up delegation for crucial methods such as `search`, etc.
-    #
-    # @example Include the module in the `Article` model definition
-    #
-    #     class Article < ActiveRecord::Base
-    #       include Elasticsearch::Model
-    #     end
-    #
-    # @example Inject the module into the `Article` model during run time
-    #
-    #     Article.__send__ :include, Elasticsearch::Model
-    #
-    #
-    def self.included(base)
-      base.class_eval do
-        include Elasticsearch::Model::Proxy
-
-        Elasticsearch::Model::Proxy::ClassMethodsProxy.class_eval do
-          include Elasticsearch::Model::Client::ClassMethods
-          include Elasticsearch::Model::Naming::ClassMethods
-          include Elasticsearch::Model::Indexing::ClassMethods
-          include Elasticsearch::Model::Searching::ClassMethods
-        end
-
-        Elasticsearch::Model::Proxy::InstanceMethodsProxy.class_eval do
-          include Elasticsearch::Model::Client::InstanceMethods
-          include Elasticsearch::Model::Naming::InstanceMethods
-          include Elasticsearch::Model::Indexing::InstanceMethods
-          include Elasticsearch::Model::Serializing::InstanceMethods
-        end
-
-        Elasticsearch::Model::Proxy::InstanceMethodsProxy.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def as_indexed_json(options={})
-            target.respond_to?(:as_indexed_json) ? target.__send__(:as_indexed_json, options) : super
-          end
-        CODE
-
-        # Delegate important methods to the `__elasticsearch__` proxy, unless they are defined already
-        #
-        class << self
-          METHODS.each do |method|
-            delegate method, to: :__elasticsearch__ unless self.public_instance_methods.include?(method)
-          end
-        end
-
-        # Mix the importing module into the proxy
-        #
-        self.__elasticsearch__.class_eval do
-          include Elasticsearch::Model::Importing::ClassMethods
-          include Adapter.from_class(base).importing_mixin
-        end
-
-        # Add to the registry if it's a class (and not in intermediate module)
-        Registry.add(base) if base.is_a?(Class)
-      end
-    end
-
-    module ClassMethods
-      # Get the client common for all models
-      #
-      # @example Get the client
-      #
-      #     Elasticsearch::Model.client
-      #     => #<Elasticsearch::Transport::Client:0x007f96a7d0d000 @transport=... >
-      #
-      def client
-        @client ||= Elasticsearch::Client.new
-      end
-
-      # Set the client for all models
-      #
-      # @example Configure (set) the client for all models
-      #
-      #     Elasticsearch::Model.client = Elasticsearch::Client.new host: 'http://localhost:9200', tracer: true
-      #     => #<Elasticsearch::Transport::Client:0x007f96a6dd0d80 @transport=... >
-      #
-      # @note You have to set the client before you call Elasticsearch methods on the model,
-      #       or set it directly on the model; see {Elasticsearch::Model::Client::ClassMethods#client}
-      #
-      def client=(client)
-        @client = client
-      end
-
-      # Search across multiple models
-      #
-      # By default, all models which include the `Elasticsearch::Model` module are searched
-      #
-      # @param query_or_payload [String,Hash,Object] The search request definition
-      #                                              (string, JSON, Hash, or object responding to `to_hash`)
-      # @param models [Array] The Array of Model objects to search
-      # @param options [Hash] Optional parameters to be passed to the Elasticsearch client
-      #
-      # @return [Elasticsearch::Model::Response::Response]
-      #
-      # @example Search across specific models
-      #
-      #     Elasticsearch::Model.search('foo', [Author, Article])
-      #
-      # @example Search across all models which include the `Elasticsearch::Model` module
-      #
-      #     Elasticsearch::Model.search('foo')
-      #
-      def search(query_or_payload, models=[], options={})
-        models = Multimodel.new(models)
-        request = Searching::SearchRequest.new(models, query_or_payload, options)
-        Response::Response.new(models, request)
-      end
-
-      # Check if inheritance is enabled
-      #
-      # @note Inheritance is disabled by default.
-      #
-      def inheritance_enabled
-        @settings[:inheritance_enabled] ||= false
-      end
-
-      # Enable inheritance of index_name and document_type
-      #
-      # @example Enable inheritance
-      #
-      #     Elasticsearch::Model.inheritance_enabled = true
-      #
-      def inheritance_enabled=(inheritance_enabled)
-        warn STI_DEPRECATION_WARNING if inheritance_enabled
-        @settings[:inheritance_enabled] = inheritance_enabled
-      end
-
-      # Access the module settings
-      #
-      def settings
-        @settings ||= {}
-      end
-
-      private
-
-      STI_DEPRECATION_WARNING = "DEPRECATION WARNING: Support for Single Table Inheritance (STI) is deprecated " +
-        "and will be removed in version 7.0.0.\nPlease save different model documents in separate indices and refer " +
-        "to the Elasticsearch documentation for more information.".freeze
-    end
-    extend ClassMethods
-
-    class NotImplemented < NoMethodError; end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapter.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapter.rb
deleted file mode 100644
index 3a25e5d97b..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapter.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Contains an adapter which provides OxM-specific implementations for common behaviour:
-    #
-    # * {Adapter::Adapter#records_mixin   Fetching records from the database}
-    # * {Adapter::Adapter#callbacks_mixin Model callbacks for automatic index updates}
-    # * {Adapter::Adapter#importing_mixin Efficient bulk loading from the database}
-    #
-    # @see Elasticsearch::Model::Adapter::Default
-    # @see Elasticsearch::Model::Adapter::ActiveRecord
-    # @see Elasticsearch::Model::Adapter::Mongoid
-    #
-    module Adapter
-
-      # Returns an adapter based on the Ruby class passed
-      #
-      # @example Create an adapter for an ActiveRecord-based model
-      #
-      #     class Article < ActiveRecord::Base; end
-      #
-      #     myadapter = Elasticsearch::Model::Adapter.from_class(Article)
-      #     myadapter.adapter
-      #     # => Elasticsearch::Model::Adapter::ActiveRecord
-      #
-      # @see Adapter.adapters The list of included adapters
-      # @see Adapter.register Register a custom adapter
-      #
-      def from_class(klass)
-        Adapter.new(klass)
-      end; module_function :from_class
-
-      # Returns registered adapters
-      #
-      # @see ::Elasticsearch::Model::Adapter::Adapter.adapters
-      #
-      def adapters
-        Adapter.adapters
-      end; module_function :adapters
-
-      # Registers an adapter
-      #
-      # @see ::Elasticsearch::Model::Adapter::Adapter.register
-      #
-      def register(name, condition)
-        Adapter.register(name, condition)
-      end; module_function :register
-
-      # Contains an adapter for specific OxM or architecture.
-      #
-      class Adapter
-        attr_reader :klass
-
-        def initialize(klass)
-          @klass = klass
-        end
-
-        # Registers an adapter for specific condition
-        #
-        # @param name      [Module] The module containing the implemented interface
-        # @param condition [Proc]   An object with a `call` method which is evaluated in {.adapter}
-        #
-        # @example Register an adapter for DataMapper
-        #
-        #     module DataMapperAdapter
-        #
-        #       # Implement the interface for fetching records
-        #       #
-        #       module Records
-        #         def records
-        #           klass.all(id: @ids)
-        #         end
-        #
-        #         # ...
-        #       end
-        #     end
-        #
-        #     # Register the adapter
-        #     #
-        #     Elasticsearch::Model::Adapter.register(
-        #       DataMapperAdapter,
-        #       lambda { |klass|
-        #         defined?(::DataMapper::Resource) and klass.ancestors.include?(::DataMapper::Resource)
-        #       }
-        #     )
-        #
-        def self.register(name, condition)
-          self.adapters[name] = condition
-        end
-
-        # Return the collection of registered adapters
-        #
-        # @example Return the currently registered adapters
-        #
-        #     Elasticsearch::Model::Adapter.adapters
-        #     # => {
-        #     #  Elasticsearch::Model::Adapter::ActiveRecord => #<Proc:0x007...(lambda)>,
-        #     #  Elasticsearch::Model::Adapter::Mongoid => #<Proc:0x007... (lambda)>,
-        #     # }
-        #
-        # @return [Hash] The collection of adapters
-        #
-        def self.adapters
-          @adapters ||= {}
-        end
-
-        # Return the module with {Default::Records} interface implementation
-        #
-        # @api private
-        #
-        def records_mixin
-          adapter.const_get(:Records)
-        end
-
-        # Return the module with {Default::Callbacks} interface implementation
-        #
-        # @api private
-        #
-        def callbacks_mixin
-          adapter.const_get(:Callbacks)
-        end
-
-        # Return the module with {Default::Importing} interface implementation
-        #
-        # @api private
-        #
-        def importing_mixin
-          adapter.const_get(:Importing)
-        end
-
-        # Returns the adapter module
-        #
-        # @api private
-        #
-        def adapter
-          @adapter ||= begin
-            self.class.adapters.find( lambda {[]} ) { |name, condition| condition.call(klass) }.first \
-            || Elasticsearch::Model::Adapter::Default
-          end
-        end
-
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb
deleted file mode 100644
index 3fb3f987e2..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-module Elasticsearch
-  module Model
-    module Adapter
-
-      # An adapter for ActiveRecord-based models
-      #
-      module ActiveRecord
-
-        Adapter.register self,
-                         lambda { |klass| !!defined?(::ActiveRecord::Base) && klass.respond_to?(:ancestors) && klass.ancestors.include?(::ActiveRecord::Base) }
-
-        module Records
-          attr_writer :options
-
-          def options
-            @options ||= {}
-          end
-
-          # Returns an `ActiveRecord::Relation` instance
-          #
-          def records
-            sql_records = klass.where(klass.primary_key => ids)
-            sql_records = sql_records.includes(self.options[:includes]) if self.options[:includes]
-
-            # Re-order records based on the order from Elasticsearch hits
-            # by redefining `to_a`, unless the user has called `order()`
-            #
-            sql_records.instance_exec(response.response['hits']['hits']) do |hits|
-              ar_records_method_name = :to_a
-              ar_records_method_name = :records if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 5
-
-              define_singleton_method(ar_records_method_name) do
-                if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
-                  self.load
-                else
-                  self.__send__(:exec_queries)
-                end
-                if !self.order_values.present?
-                  @records.sort_by { |record| hits.index { |hit| hit['_id'].to_s == record.id.to_s } }
-                else
-                  @records
-                end
-              end if self
-            end
-
-            sql_records
-          end
-
-          # Prevent clash with `ActiveSupport::Dependencies::Loadable`
-          #
-          def load
-            records.__send__(:load)
-          end
-        end
-
-        module Callbacks
-
-          # Handle index updates (creating, updating or deleting documents)
-          # when the model changes, by hooking into the lifecycle
-          #
-          # @see http://guides.rubyonrails.org/active_record_callbacks.html
-          #
-          def self.included(base)
-            base.class_eval do
-              after_commit lambda { __elasticsearch__.index_document  },  on: :create
-              after_commit lambda { __elasticsearch__.update_document },  on: :update
-              after_commit lambda { __elasticsearch__.delete_document },  on: :destroy
-            end
-          end
-        end
-
-        module Importing
-
-          # Fetch batches of records from the database (used by the import method)
-          #
-          #
-          # @see http://api.rubyonrails.org/classes/ActiveRecord/Batches.html ActiveRecord::Batches.find_in_batches
-          #
-          def __find_in_batches(options={}, &block)
-            query = options.delete(:query)
-            named_scope = options.delete(:scope)
-            preprocess = options.delete(:preprocess)
-
-            scope = self
-            scope = scope.__send__(named_scope) if named_scope
-            scope = scope.instance_exec(&query) if query
-
-            scope.find_in_batches(options) do |batch|
-              batch = self.__send__(preprocess, batch) if preprocess
-              yield(batch) if batch.present?
-            end
-          end
-
-          def __transform
-            lambda { |model|  { index: { _id: model.id, data: model.__elasticsearch__.as_indexed_json } } }
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/default.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/default.rb
deleted file mode 100644
index e58cf4ceb3..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/default.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-module Elasticsearch
-  module Model
-    module Adapter
-
-      # The default adapter for models which haven't one registered
-      #
-      module Default
-
-        # Module for implementing methods and logic related to fetching records from the database
-        #
-        module Records
-
-          # Return the collection of records fetched from the database
-          #
-          # By default uses `MyModel#find[1, 2, 3]`
-          #
-          def records
-            klass.find(@ids)
-          end
-        end
-
-        # Module for implementing methods and logic related to hooking into model lifecycle
-        # (e.g. to perform automatic index updates)
-        #
-        # @see http://api.rubyonrails.org/classes/ActiveModel/Callbacks.html
-        module Callbacks
-          # noop
-        end
-
-        # Module for efficiently fetching records from the database to import them into the index
-        #
-        module Importing
-
-          # @abstract Implement this method in your adapter
-          #
-          def __find_in_batches(options={}, &block)
-            raise NotImplemented, "Method not implemented for default adapter"
-          end
-
-          # @abstract Implement this method in your adapter
-          #
-          def __transform
-            raise NotImplemented, "Method not implemented for default adapter"
-          end
-        end
-
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/mongoid.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/mongoid.rb
deleted file mode 100644
index d4aff56f92..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/mongoid.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-module Elasticsearch
-  module Model
-    module Adapter
-
-      # An adapter for Mongoid-based models
-      #
-      # @see http://mongoid.org
-      #
-      module Mongoid
-
-        Adapter.register self,
-                         lambda { |klass| !!defined?(::Mongoid::Document) && klass.respond_to?(:ancestors) && klass.ancestors.include?(::Mongoid::Document) }
-
-        module Records
-
-          # Return a `Mongoid::Criteria` instance
-          #
-          def records
-            criteria = klass.where(:id.in => ids)
-
-            criteria.instance_exec(response.response['hits']['hits']) do |hits|
-              define_singleton_method :to_a do
-                self.entries.sort_by { |e| hits.index { |hit| hit['_id'].to_s == e.id.to_s } }
-              end
-            end
-
-            criteria
-          end
-
-          # Intercept call to sorting methods, so we can ignore the order from Elasticsearch
-          #
-          %w| asc desc order_by |.each do |name|
-            define_method name do |*args|
-              criteria = records.__send__ name, *args
-              criteria.instance_exec do
-                define_singleton_method(:to_a) { self.entries }
-              end
-
-              criteria
-            end
-          end
-        end
-
-        module Callbacks
-
-          # Handle index updates (creating, updating or deleting documents)
-          # when the model changes, by hooking into the lifecycle
-          #
-          # @see http://mongoid.org/en/mongoid/docs/callbacks.html
-          #
-          def self.included(base)
-            base.after_create  { |document| document.__elasticsearch__.index_document  }
-            base.after_update  { |document| document.__elasticsearch__.update_document }
-            base.after_destroy { |document| document.__elasticsearch__.delete_document }
-          end
-        end
-
-        module Importing
-
-          # Fetch batches of records from the database
-          #
-          # @see https://github.com/mongoid/mongoid/issues/1334
-          # @see https://github.com/karmi/retire/pull/724
-          #
-          def __find_in_batches(options={}, &block)
-            batch_size = options[:batch_size] || 1_000
-            query = options[:query]
-            named_scope = options[:scope]
-            preprocess = options[:preprocess]
-
-            scope = all
-            scope = scope.send(named_scope) if named_scope
-            scope = query.is_a?(Proc) ? scope.class_exec(&query) : scope.where(query) if query
-  
-            scope.no_timeout.each_slice(batch_size) do |items|
-              yield (preprocess ? self.__send__(preprocess, items) : items)
-            end
-          end
-
-          def __transform
-            lambda {|a|  { index: { _id: a.id.to_s, data: a.as_indexed_json } }}
-          end
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/multiple.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/multiple.rb
deleted file mode 100644
index 9a0bc4e8eb..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/adapters/multiple.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-module Elasticsearch
-  module Model
-    module Adapter
-
-      # An adapter to be used for deserializing results from multiple models,
-      # retrieved through `Elasticsearch::Model.search`
-      #
-      # @see Elasticsearch::Model.search
-      #
-      module Multiple
-        Adapter.register self, lambda { |klass| klass.is_a? Multimodel }
-
-        module Records
-          # Returns a collection of model instances, possibly of different classes (ActiveRecord, Mongoid, ...)
-          #
-          # @note The order of results in the Elasticsearch response is preserved
-          #
-          def records
-            records_by_type = __records_by_type
-
-            records = response.response["hits"]["hits"].map do |hit|
-              records_by_type[ __type_for_hit(hit) ][ hit[:_id] ]
-            end
-
-            records.compact
-          end
-
-          # Returns the collection of records grouped by class based on `_type`
-          #
-          # Example:
-          #
-          # {
-          #   Foo  => {"1"=> #<Foo id: 1, title: "ABC"}, ...},
-          #   Bar  => {"1"=> #<Bar id: 1, name: "XYZ"}, ...}
-          # }
-          #
-          # @api private
-          #
-          def __records_by_type
-            result = __ids_by_type.map do |klass, ids|
-              records = __records_for_klass(klass, ids)
-              ids     = records.map(&:id).map(&:to_s)
-              [ klass, Hash[ids.zip(records)] ]
-            end
-
-            Hash[result]
-          end
-
-          # Returns the collection of records for a specific type based on passed `klass`
-          #
-          # @api private
-          #
-          def __records_for_klass(klass, ids)
-            adapter = __adapter_for_klass(klass)
-
-            case
-              when Elasticsearch::Model::Adapter::ActiveRecord.equal?(adapter)
-                klass.where(klass.primary_key => ids)
-              when Elasticsearch::Model::Adapter::Mongoid.equal?(adapter)
-                klass.where(:id.in => ids)
-              else
-                klass.find(ids)
-            end
-          end
-
-          # Returns the record IDs grouped by class based on type `_type`
-          #
-          # Example:
-          #
-          #   { Foo => ["1"], Bar => ["1", "5"] }
-          #
-          # @api private
-          #
-          def __ids_by_type
-            ids_by_type = {}
-
-            response.response["hits"]["hits"].each do |hit|
-              type = __type_for_hit(hit)
-              ids_by_type[type] ||= []
-              ids_by_type[type] << hit[:_id]
-            end
-            ids_by_type
-          end
-
-          # Returns the class of the model corresponding to a specific `hit` in Elasticsearch results
-          #
-          # @see Elasticsearch::Model::Registry
-          #
-          # @api private
-          #
-          def __type_for_hit(hit)
-            @@__types ||= {}
-
-            @@__types[ "#{hit[:_index]}::#{hit[:_type]}" ] ||= begin
-              Registry.all.detect do |model|
-                model.index_name == hit[:_index] && model.document_type == hit[:_type]
-              end
-            end
-          end
-
-          # Returns the adapter registered for a particular `klass` or `nil` if not available
-          #
-          # @api private
-          #
-          def __adapter_for_klass(klass)
-            Adapter.adapters.select { |name, checker| checker.call(klass) }.keys.first
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/callbacks.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/callbacks.rb
deleted file mode 100644
index 1b72cb2a03..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/callbacks.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Allows to automatically update index based on model changes,
-    # by hooking into the model lifecycle.
-    #
-    # @note A blocking HTTP request is done during the update process.
-    #       If you need a more performant/resilient way of updating the index,
-    #       consider adapting the callbacks behaviour, and use a background
-    #       processing solution such as [Sidekiq](http://sidekiq.org)
-    #       or [Resque](https://github.com/resque/resque).
-    #
-    module Callbacks
-
-      # When included in a model, automatically injects the callback subscribers (`after_save`, etc)
-      #
-      # @example Automatically update Elasticsearch index when the model changes
-      #
-      #     class Article
-      #       include Elasticsearch::Model
-      #       include Elasticsearch::Model::Callbacks
-      #     end
-      #
-      #     Article.first.update_attribute :title, 'Updated'
-      #     #  SQL (0.3ms)  UPDATE "articles" SET "title" = ...
-      #     #  2013-11-20 15:08:52 +0100: POST http://localhost:9200/articles/article/1/_update ...
-      #
-      def self.included(base)
-        adapter = Adapter.from_class(base)
-        base.__send__ :include, adapter.callbacks_mixin
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/client.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/client.rb
deleted file mode 100644
index c1a9b4ed91..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/client.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Contains an `Elasticsearch::Client` instance
-    #
-    module Client
-
-      module ClassMethods
-
-        # Get the client for a specific model class
-        #
-        # @example Get the client for `Article` and perform API request
-        #
-        #     Article.client.cluster.health
-        #     # => { "cluster_name" => "elasticsearch" ... }
-        #
-        def client client=nil
-          @client ||= Elasticsearch::Model.client
-        end
-
-        # Set the client for a specific model class
-        #
-        # @example Configure the client for the `Article` model
-        #
-        #     Article.client = Elasticsearch::Client.new host: 'http://api.server:8080'
-        #     Article.search ...
-        #
-        def client=(client)
-          @client = client
-        end
-      end
-
-      module InstanceMethods
-
-        # Get or set the client for a specific model instance
-        #
-        # @example Get the client for a specific record and perform API request
-        #
-        #     @article = Article.first
-        #     @article.client.info
-        #     # => { "name" => "Node-1", ... }
-        #
-        def client
-          @client ||= self.class.client
-        end
-
-        # Set the client for a specific model instance
-        #
-        # @example Set the client for a specific record
-        #
-        #     @article = Article.first
-        #     @article.client = Elasticsearch::Client.new host: 'http://api.server:8080'
-        #
-        def client=(client)
-          @client = client
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/ext/active_record.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/ext/active_record.rb
deleted file mode 100644
index ffa6cc385a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/ext/active_record.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Prevent `MyModel.inspect` failing with `ActiveRecord::ConnectionNotEstablished`
-# (triggered by elasticsearch-model/lib/elasticsearch/model.rb:79:in `included')
-#
-ActiveRecord::Base.instance_eval do
-  class << self
-    def inspect_with_rescue
-      inspect_without_rescue
-    rescue ActiveRecord::ConnectionNotEstablished
-      "#{self}(no database connection)"
-    end
-
-    alias_method_chain :inspect, :rescue
-  end
-end if defined?(ActiveRecord) && ActiveRecord::VERSION::STRING < '4'
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/hash_wrapper.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/hash_wrapper.rb
deleted file mode 100644
index 484d292a67..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/hash_wrapper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Subclass of `Hashie::Mash` to wrap Hash-like structures
-    # (responses from Elasticsearch, search definitions, etc)
-    #
-    # The primary goal of the subclass is to disable the
-    # warning being printed by Hashie for re-defined
-    # methods, such as `sort`.
-    #
-    class HashWrapper < ::Hashie::Mash
-      disable_warnings if respond_to?(:disable_warnings)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/importing.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/importing.rb
deleted file mode 100644
index 764413acf8..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/importing.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Provides support for easily and efficiently importing large amounts of
-    # records from the including class into the index.
-    #
-    # @see ClassMethods#import
-    #
-    module Importing
-
-      # When included in a model, adds the importing methods.
-      #
-      # @example Import all records from the `Article` model
-      #
-      #     Article.import
-      #
-      # @see #import
-      #
-      def self.included(base)
-        base.__send__ :extend, ClassMethods
-
-        adapter = Adapter.from_class(base)
-        base.__send__ :include, adapter.importing_mixin
-        base.__send__ :extend,  adapter.importing_mixin
-      end
-
-      module ClassMethods
-
-        # Import all model records into the index
-        #
-        # The method will pick up correct strategy based on the `Importing` module
-        # defined in the corresponding adapter.
-        #
-        # @param options [Hash] Options passed to the underlying `__find_in_batches`method
-        # @param block  [Proc] Optional block to evaluate for each batch
-        #
-        # @yield [Hash] Gives the Hash with the Elasticsearch response to the block
-        #
-        # @return [Fixnum] Number of errors encountered during importing
-        #
-        # @example Import all records into the index
-        #
-        #     Article.import
-        #
-        # @example Set the batch size to 100
-        #
-        #     Article.import batch_size: 100
-        #
-        # @example Process the response from Elasticsearch
-        #
-        #     Article.import do |response|
-        #       puts "Got " + response['items'].select { |i| i['index']['error'] }.size.to_s + " errors"
-        #     end
-        #
-        # @example Delete and create the index with appropriate settings and mappings
-        #
-        #    Article.import force: true
-        #
-        # @example Refresh the index after importing all batches
-        #
-        #    Article.import refresh: true
-        #
-        # @example Import the records into a different index/type than the default one
-        #
-        #    Article.import index: 'my-new-index', type: 'my-other-type'
-        #
-        # @example Pass an ActiveRecord scope to limit the imported records
-        #
-        #    Article.import scope: 'published'
-        #
-        # @example Pass an ActiveRecord query to limit the imported records
-        #
-        #    Article.import query: -> { where(author_id: author_id) }
-        #
-        # @example Transform records during the import with a lambda
-        #
-        #    transform = lambda do |a|
-        #      {index: {_id: a.id, _parent: a.author_id, data: a.__elasticsearch__.as_indexed_json}}
-        #    end
-        #
-        #    Article.import transform: transform
-        #
-        # @example Update the batch before yielding it
-        #
-        #     class Article
-        #       # ...
-        #       def self.enrich(batch)
-        #         batch.each do |item|
-        #           item.metadata = MyAPI.get_metadata(item.id)
-        #         end
-        #         batch
-        #       end
-        #     end
-        #
-        #    Article.import preprocess: :enrich
-        #
-        # @example Return an array of error elements instead of the number of errors, eg.
-        #          to try importing these records again
-        #
-        #    Article.import return: 'errors'
-        #
-        def import(options={}, &block)
-          errors       = []
-          refresh      = options.delete(:refresh)   || false
-          target_index = options.delete(:index)     || index_name
-          target_type  = options.delete(:type)      || document_type
-          transform    = options.delete(:transform) || __transform
-          return_value = options.delete(:return)    || 'count'
-
-          unless transform.respond_to?(:call)
-            raise ArgumentError,
-                  "Pass an object responding to `call` as the :transform option, #{transform.class} given"
-          end
-
-          if options.delete(:force)
-            self.create_index! force: true, index: target_index
-          elsif !self.index_exists? index: target_index
-            raise ArgumentError,
-                  "#{target_index} does not exist to be imported into. Use create_index! or the :force option to create it."
-          end
-
-          __find_in_batches(options) do |batch|
-            response = client.bulk \
-                         index:   target_index,
-                         type:    target_type,
-                         body:    __batch_to_bulk(batch, transform)
-
-            yield response if block_given?
-
-            errors +=  response['items'].select { |k, v| k.values.first['error'] }
-          end
-
-          self.refresh_index! index: target_index if refresh
-
-          case return_value
-            when 'errors'
-              errors
-            else
-              errors.size
-          end
-        end
-
-        def __batch_to_bulk(batch, transform)
-          batch.map { |model| transform.call(model) }
-        end
-      end
-
-    end
-
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/indexing.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/indexing.rb
deleted file mode 100644
index a88dd12fbe..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/indexing.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Provides the necessary support to set up index options (mappings, settings)
-    # as well as instance methods to create, update or delete documents in the index.
-    #
-    # @see ClassMethods#settings
-    # @see ClassMethods#mapping
-    #
-    # @see InstanceMethods#index_document
-    # @see InstanceMethods#update_document
-    # @see InstanceMethods#delete_document
-    #
-    module Indexing
-
-      # Wraps the [index settings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html#configuration-index-settings)
-      #
-      class Settings
-        attr_accessor :settings
-
-        def initialize(settings={})
-          @settings = settings
-        end
-
-        def to_hash
-          @settings
-        end
-
-        def as_json(options={})
-          to_hash
-        end
-      end
-
-      # Wraps the [index mappings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping.html)
-      #
-      class Mappings
-        attr_accessor :options, :type
-
-        # @private
-        TYPES_WITH_EMBEDDED_PROPERTIES = %w(object nested)
-
-        def initialize(type, options={})
-          raise ArgumentError, "`type` is missing" if type.nil?
-
-          @type    = type
-          @options = options
-          @mapping = {}
-        end
-
-        def indexes(name, options={}, &block)
-          @mapping[name] = options
-
-          if block_given?
-            @mapping[name][:type] ||= 'object'
-            properties = TYPES_WITH_EMBEDDED_PROPERTIES.include?(@mapping[name][:type].to_s) ? :properties : :fields
-
-            @mapping[name][properties] ||= {}
-
-            previous = @mapping
-            begin
-              @mapping = @mapping[name][properties]
-              self.instance_eval(&block)
-            ensure
-              @mapping = previous
-            end
-          end
-
-          # Set the type to `text` by default
-          @mapping[name][:type] ||= 'text'
-
-          self
-        end
-
-        def to_hash
-          { @type.to_sym => @options.merge( properties: @mapping ) }
-        end
-
-        def as_json(options={})
-          to_hash
-        end
-      end
-
-      module ClassMethods
-
-        # Defines mappings for the index
-        #
-        # @example Define mapping for model
-        #
-        #     class Article
-        #       mapping dynamic: 'strict' do
-        #         indexes :foo do
-        #           indexes :bar
-        #         end
-        #         indexes :baz
-        #       end
-        #     end
-        #
-        #     Article.mapping.to_hash
-        #
-        #     # => { :article =>
-        #     #        { :dynamic => "strict",
-        #     #          :properties=>
-        #     #            { :foo => {
-        #     #                :type=>"object",
-        #     #                :properties => {
-        #     #                  :bar => { :type => "string" }
-        #     #                }
-        #     #              }
-        #     #            },
-        #     #           :baz => { :type=> "string" }
-        #     #        }
-        #     #    }
-        #
-        # @example Define index settings and mappings
-        #
-        #     class Article
-        #       settings number_of_shards: 1 do
-        #         mappings do
-        #           indexes :foo
-        #         end
-        #       end
-        #     end
-        #
-        # @example Call the mapping method directly
-        #
-        #     Article.mapping(dynamic: 'strict') { indexes :foo, type: 'long' }
-        #
-        #     Article.mapping.to_hash
-        #
-        #     # => {:article=>{:dynamic=>"strict", :properties=>{:foo=>{:type=>"long"}}}}
-        #
-        # The `mappings` and `settings` methods are accessible directly on the model class,
-        # when it doesn't already define them. Use the `__elasticsearch__` proxy otherwise.
-        #
-        def mapping(options={}, &block)
-          @mapping ||= Mappings.new(document_type, options)
-
-          @mapping.options.update(options) unless options.empty?
-
-          if block_given?
-            @mapping.instance_eval(&block)
-            return self
-          else
-            @mapping
-          end
-        end; alias_method :mappings, :mapping
-
-        # Define settings for the index
-        #
-        # @example Define index settings
-        #
-        #     Article.settings(index: { number_of_shards: 1 })
-        #
-        #     Article.settings.to_hash
-        #
-        #     # => {:index=>{:number_of_shards=>1}}
-        #
-        # You can read settings from any object that responds to :read
-        # as long as its return value can be parsed as either YAML or JSON.
-        #
-        # @example Define index settings from YAML file
-        #
-        #     # config/elasticsearch/articles.yml:
-        #     #
-        #     # index:
-        #     #   number_of_shards: 1
-        #     #
-        #
-        #     Article.settings File.open("config/elasticsearch/articles.yml")
-        #
-        #     Article.settings.to_hash
-        #
-        #     # => { "index" => { "number_of_shards" => 1 } }
-        #
-        #
-        # @example Define index settings from JSON file
-        #
-        #     # config/elasticsearch/articles.json:
-        #     #
-        #     # { "index": { "number_of_shards": 1 } }
-        #     #
-        #
-        #     Article.settings File.open("config/elasticsearch/articles.json")
-        #
-        #     Article.settings.to_hash
-        #
-        #     # => { "index" => { "number_of_shards" => 1 } }
-        #
-        def settings(settings={}, &block)
-          settings = YAML.load(settings.read) if settings.respond_to?(:read)
-          @settings ||= Settings.new(settings)
-
-          @settings.settings.update(settings) unless settings.empty?
-
-          if block_given?
-            self.instance_eval(&block)
-            return self
-          else
-            @settings
-          end
-        end
-
-        def load_settings_from_io(settings)
-          YAML.load(settings.read)
-        end
-
-        # Creates an index with correct name, automatically passing
-        # `settings` and `mappings` defined in the model
-        #
-        # @example Create an index for the `Article` model
-        #
-        #     Article.__elasticsearch__.create_index!
-        #
-        # @example Forcefully create (delete first) an index for the `Article` model
-        #
-        #     Article.__elasticsearch__.create_index! force: true
-        #
-        # @example Pass a specific index name
-        #
-        #     Article.__elasticsearch__.create_index! index: 'my-index'
-        #
-        def create_index!(options={})
-          options = options.clone
-
-          target_index = options.delete(:index)    || self.index_name
-          settings     = options.delete(:settings) || self.settings.to_hash
-          mappings     = options.delete(:mappings) || self.mappings.to_hash
-
-          delete_index!(options.merge index: target_index) if options[:force]
-
-          unless index_exists?(index: target_index)
-            self.client.indices.create index: target_index,
-                                       body: {
-                                         settings: settings,
-                                         mappings: mappings }
-          end
-        end
-
-        # Returns true if the index exists
-        #
-        # @example Check whether the model's index exists
-        #
-        #     Article.__elasticsearch__.index_exists?
-        #
-        # @example Check whether a specific index exists
-        #
-        #     Article.__elasticsearch__.index_exists? index: 'my-index'
-        #
-        def index_exists?(options={})
-          target_index = options[:index] || self.index_name
-
-          self.client.indices.exists(index: target_index) rescue false
-        end
-
-        # Deletes the index with corresponding name
-        #
-        # @example Delete the index for the `Article` model
-        #
-        #     Article.__elasticsearch__.delete_index!
-        #
-        # @example Pass a specific index name
-        #
-        #     Article.__elasticsearch__.delete_index! index: 'my-index'
-        #
-        def delete_index!(options={})
-          target_index = options.delete(:index) || self.index_name
-
-          begin
-            self.client.indices.delete index: target_index
-          rescue Exception => e
-            if e.class.to_s =~ /NotFound/ && options[:force]
-              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
-              nil
-            else
-              raise e
-            end
-          end
-        end
-
-        # Performs the "refresh" operation for the index (useful e.g. in tests)
-        #
-        # @example Refresh the index for the `Article` model
-        #
-        #     Article.__elasticsearch__.refresh_index!
-        #
-        # @example Pass a specific index name
-        #
-        #     Article.__elasticsearch__.refresh_index! index: 'my-index'
-        #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html
-        #
-        def refresh_index!(options={})
-          target_index = options.delete(:index) || self.index_name
-
-          begin
-            self.client.indices.refresh index: target_index
-          rescue Exception => e
-            if e.class.to_s =~ /NotFound/ && options[:force]
-              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
-              nil
-            else
-              raise e
-            end
-          end
-        end
-      end
-
-      module InstanceMethods
-
-        def self.included(base)
-          # Register callback for storing changed attributes for models
-          # which implement `before_save` and return changed attributes
-          # (ie. when `Elasticsearch::Model` is included)
-          #
-          # @note This is typically triggered only when the module would be
-          #       included in the model directly, not within the proxy.
-          #
-          # @see #update_document
-          #
-          base.before_save do |i|
-            if i.class.instance_methods.include?(:changes_to_save) # Rails 5.1
-              i.instance_variable_set(:@__changed_model_attributes,
-                                      Hash[ i.changes_to_save.map { |key, value| [key, value.last] } ])
-            elsif i.class.instance_methods.include?(:changes)
-              i.instance_variable_set(:@__changed_model_attributes,
-                                      Hash[ i.changes.map { |key, value| [key, value.last] } ])
-            end
-          end if base.respond_to?(:before_save)
-        end
-
-        # Serializes the model instance into JSON (by calling `as_indexed_json`),
-        # and saves the document into the Elasticsearch index.
-        #
-        # @param options [Hash] Optional arguments for passing to the client
-        #
-        # @example Index a record
-        #
-        #     @article.__elasticsearch__.index_document
-        #     2013-11-20 16:25:57 +0100: PUT http://localhost:9200/articles/article/1 ...
-        #
-        # @return [Hash] The response from Elasticsearch
-        #
-        # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:index
-        #
-        def index_document(options={})
-          document = self.as_indexed_json
-
-          client.index(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id,
-              body:  document }.merge(options)
-          )
-        end
-
-        # Deletes the model instance from the index
-        #
-        # @param options [Hash] Optional arguments for passing to the client
-        #
-        # @example Delete a record
-        #
-        #     @article.__elasticsearch__.delete_document
-        #     2013-11-20 16:27:00 +0100: DELETE http://localhost:9200/articles/article/1
-        #
-        # @return [Hash] The response from Elasticsearch
-        #
-        # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:delete
-        #
-        def delete_document(options={})
-          client.delete(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id }.merge(options)
-          )
-        end
-
-        # Tries to gather the changed attributes of a model instance
-        # (via [ActiveModel::Dirty](http://api.rubyonrails.org/classes/ActiveModel/Dirty.html)),
-        # performing a _partial_ update of the document.
-        #
-        # When the changed attributes are not available, performs full re-index of the record.
-        #
-        # See the {#update_document_attributes} method for updating specific attributes directly.
-        #
-        # @param options [Hash] Optional arguments for passing to the client
-        #
-        # @example Update a document corresponding to the record
-        #
-        #     @article = Article.first
-        #     @article.update_attribute :title, 'Updated'
-        #     # SQL (0.3ms)  UPDATE "articles" SET "title" = ?...
-        #
-        #     @article.__elasticsearch__.update_document
-        #     # 2013-11-20 17:00:05 +0100: POST http://localhost:9200/articles/article/1/_update ...
-        #     # 2013-11-20 17:00:05 +0100: > {"doc":{"title":"Updated"}}
-        #
-        # @return [Hash] The response from Elasticsearch
-        #
-        # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:update
-        #
-        def update_document(options={})
-          if attributes_in_database = self.instance_variable_get(:@__changed_model_attributes).presence
-            attributes = if respond_to?(:as_indexed_json)
-              self.as_indexed_json.select { |k,v| attributes_in_database.keys.map(&:to_s).include? k.to_s }
-            else
-              attributes_in_database
-            end
-
-            client.update(
-              { index: index_name,
-                type:  document_type,
-                id:    self.id,
-                body:  { doc: attributes } }.merge(options)
-            ) unless attributes.empty?
-          else
-            index_document(options)
-          end
-        end
-
-        # Perform a _partial_ update of specific document attributes
-        # (without consideration for changed attributes as in {#update_document})
-        #
-        # @param attributes [Hash] Attributes to be updated
-        # @param options    [Hash] Optional arguments for passing to the client
-        #
-        # @example Update the `title` attribute
-        #
-        #     @article = Article.first
-        #     @article.title = "New title"
-        #     @article.__elasticsearch__.update_document_attributes title: "New title"
-        #
-        # @return [Hash] The response from Elasticsearch
-        #
-        def update_document_attributes(attributes, options={})
-          client.update(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id,
-              body:  { doc: attributes } }.merge(options)
-          )
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/multimodel.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/multimodel.rb
deleted file mode 100644
index 8831d4fd09..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/multimodel.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Keeps a global registry of classes that include `Elasticsearch::Model`
-    #
-    class Registry
-      def initialize
-        @models = []
-      end
-
-      # Returns the unique instance of the registry (Singleton)
-      #
-      # @api private
-      #
-      def self.__instance
-        @instance ||= new
-      end
-
-      # Adds a model to the registry
-      #
-      def self.add(klass)
-        __instance.add(klass)
-      end
-
-      # Returns an Array of registered models
-      #
-      def self.all
-        __instance.models
-      end
-
-      # Adds a model to the registry
-      #
-      def add(klass)
-        @models << klass
-      end
-
-      # Returns a copy of the registered models
-      #
-      def models
-        @models.dup
-      end
-    end
-
-    # Wraps a collection of models when querying multiple indices
-    #
-    # @see Elasticsearch::Model.search
-    #
-    class Multimodel
-      attr_reader :models
-
-      # @param models [Class] The list of models across which the search will be performed
-      #
-      def initialize(*models)
-        @models = models.flatten
-        @models = Model::Registry.all if @models.empty?
-      end
-
-      # Get an Array of index names used for retrieving documents when doing a search across multiple models
-      #
-      # @return [Array] the list of index names used for retrieving documents
-      #
-      def index_name
-        models.map { |m| m.index_name }
-      end
-
-      # Get an Array of document types used for retrieving documents when doing a search across multiple models
-      #
-      # @return [Array] the list of document types used for retrieving documents
-      #
-      def document_type
-        models.map { |m| m.document_type }
-      end
-
-      # Get the client common for all models
-      #
-      # @return Elasticsearch::Transport::Client
-      #
-      def client
-        Elasticsearch::Model.client
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/naming.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/naming.rb
deleted file mode 100644
index 50b396c377..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/naming.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Provides methods for getting and setting index name and document type for the model
-    #
-    module Naming
-
-      DEFAULT_DOC_TYPE = '_doc'.freeze
-
-      module ClassMethods
-
-        # Get or set the name of the index
-        #
-        # @example Set the index name for the `Article` model
-        #
-        #     class Article
-        #       index_name "articles-#{Rails.env}"
-        #     end
-        #
-        # @example Set the index name for the `Article` model and re-evaluate it on each call
-        #
-        #     class Article
-        #       index_name { "articles-#{Time.now.year}" }
-        #     end
-        #
-        # @example Directly set the index name for the `Article` model
-        #
-        #     Article.index_name "articles-#{Rails.env}"
-        #
-        #
-        def index_name name=nil, &block
-          if name || block_given?
-            return (@index_name = name || block)
-          end
-
-          if @index_name.respond_to?(:call)
-            @index_name.call
-          else
-            @index_name || implicit(:index_name)
-          end
-        end
-
-        # Set the index name
-        #
-        # @see index_name
-        def index_name=(name)
-          @index_name = name
-        end
-
-        # Get or set the document type
-        #
-        # @example Set the document type for the `Article` model
-        #
-        #     class Article
-        #       document_type "my-article"
-        #     end
-        #
-        # @example Directly set the document type for the `Article` model
-        #
-        #     Article.document_type "my-article"
-        #
-        def document_type name=nil
-          @document_type = name || @document_type || implicit(:document_type)
-        end
-
-
-        # Set the document type
-        #
-        # @see document_type
-        #
-        def document_type=(name)
-          @document_type = name
-        end
-
-        private
-
-          def implicit(prop)
-            value = nil
-
-            if Elasticsearch::Model.settings[:inheritance_enabled]
-              self.ancestors.each do |klass|
-                # When Naming is included in Proxy::ClassMethods the actual model
-                # is among its ancestors. We don't want to call the actual model
-                # since it will result in the same call to the same instance of
-                # Proxy::ClassMethods. To prevent this we also skip the ancestor
-                # that is the target.
-                next if klass == self || self.respond_to?(:target) && klass == self.target
-                break if value = klass.respond_to?(prop) && klass.send(prop)
-              end
-            end
-
-            value || self.send("default_#{prop}")
-          end
-
-          def default_index_name
-            self.model_name.collection.gsub(/\//, '-')
-          end
-
-          def default_document_type
-            DEFAULT_DOC_TYPE
-          end
-
-      end
-
-      module InstanceMethods
-
-        # Get or set the index name for the model instance
-        #
-        # @example Set the index name for an instance of the `Article` model
-        #
-        #     @article.index_name "articles-#{@article.user_id}"
-        #     @article.__elasticsearch__.update_document
-        #
-        def index_name name=nil, &block
-          if name || block_given?
-            return (@index_name = name || block)
-          end
-
-          if @index_name.respond_to?(:call)
-            @index_name.call
-          else
-            @index_name || self.class.index_name
-          end
-        end
-
-        # Set the index name
-        #
-        # @see index_name
-        def index_name=(name)
-          @index_name = name
-        end
-
-        # @example Set the document type for an instance of the `Article` model
-        #
-        #     @article.document_type "my-article"
-        #     @article.__elasticsearch__.update_document
-        #
-        def document_type name=nil
-          @document_type = name || @document_type || self.class.document_type
-        end
-
-        # Set the document type
-        #
-        # @see document_type
-        #
-        def document_type=(name)
-          @document_type = name
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/proxy.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/proxy.rb
deleted file mode 100644
index a1c89ca958..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/proxy.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # This module provides a proxy interfacing between the including class and
-    # {Elasticsearch::Model}, preventing the pollution of the including class namespace.
-    #
-    # The only "gateway" between the model and Elasticsearch::Model is the
-    # `__elasticsearch__` class and instance method.
-    #
-    # The including class must be compatible with
-    # [ActiveModel](https://github.com/rails/rails/tree/master/activemodel).
-    #
-    # @example Include the {Elasticsearch::Model} module into an `Article` model
-    #
-    #     class Article < ActiveRecord::Base
-    #       include Elasticsearch::Model
-    #     end
-    #
-    #     Article.__elasticsearch__.respond_to?(:search)
-    #     # => true
-    #
-    #     article = Article.first
-    #
-    #     article.respond_to? :index_document
-    #     # => false
-    #
-    #     article.__elasticsearch__.respond_to?(:index_document)
-    #     # => true
-    #
-    module Proxy
-
-      # Define the `__elasticsearch__` class and instance methods in the including class
-      # and register a callback for intercepting changes in the model.
-      #
-      # @note The callback is triggered only when `Elasticsearch::Model` is included in the
-      #       module and the functionality is accessible via the proxy.
-      #
-      def self.included(base)
-        base.class_eval do
-          # {ClassMethodsProxy} instance, accessed as `MyModel.__elasticsearch__`
-          #
-          def self.__elasticsearch__ &block
-            @__elasticsearch__ ||= ClassMethodsProxy.new(self)
-            @__elasticsearch__.instance_eval(&block) if block_given?
-            @__elasticsearch__
-          end
-
-          # {InstanceMethodsProxy}, accessed as `@mymodel.__elasticsearch__`
-          #
-          def __elasticsearch__ &block
-            @__elasticsearch__ ||= InstanceMethodsProxy.new(self)
-            @__elasticsearch__.instance_eval(&block) if block_given?
-            @__elasticsearch__
-          end
-
-          # Register a callback for storing changed attributes for models which implement
-          # `before_save` method and return changed attributes (ie. when `Elasticsearch::Model` is included)
-          #
-          # @see http://api.rubyonrails.org/classes/ActiveModel/Dirty.html
-          #
-          before_save do |i|
-            if i.class.instance_methods.include?(:changes_to_save) # Rails 5.1
-              a = i.__elasticsearch__.instance_variable_get(:@__changed_model_attributes) || {}
-              i.__elasticsearch__.instance_variable_set(:@__changed_model_attributes,
-                                                        a.merge(Hash[ i.changes_to_save.map { |key, value| [key, value.last] } ]))
-            elsif i.class.instance_methods.include?(:changes)
-              a = i.__elasticsearch__.instance_variable_get(:@__changed_model_attributes) || {}
-              i.__elasticsearch__.instance_variable_set(:@__changed_model_attributes,
-                                                        a.merge(Hash[ i.changes.map { |key, value| [key, value.last] } ]))
-            end
-          end if respond_to?(:before_save)
-        end
-      end
-
-      # @overload dup
-      #
-      # Returns a copy of this object. Resets the __elasticsearch__ proxy so
-      # the duplicate will build its own proxy.
-      def initialize_dup(_)
-        @__elasticsearch__ = nil
-        super
-      end
-
-      # Common module for the proxy classes
-      #
-      module Base
-        attr_reader :target
-
-        def initialize(target)
-          @target = target
-        end
-
-        # Delegate methods to `@target`
-        #
-        def method_missing(method_name, *arguments, &block)
-          target.respond_to?(method_name) ? target.__send__(method_name, *arguments, &block) : super
-        end
-
-        # Respond to methods from `@target`
-        #
-        def respond_to?(method_name, include_private = false)
-          target.respond_to?(method_name) || super
-        end
-
-        def inspect
-          "[PROXY] #{target.inspect}"
-        end
-      end
-
-      # A proxy interfacing between Elasticsearch::Model class methods and model class methods
-      #
-      # TODO: Inherit from BasicObject and make Pry's `ls` command behave?
-      #
-      class ClassMethodsProxy
-        include Base
-      end
-
-      # A proxy interfacing between Elasticsearch::Model instance methods and model instance methods
-      #
-      # TODO: Inherit from BasicObject and make Pry's `ls` command behave?
-      #
-      class InstanceMethodsProxy
-        include Base
-
-        def klass
-          target.class
-        end
-
-        def class
-          klass.__elasticsearch__
-        end
-
-        # Need to redefine `as_json` because we're not inheriting from `BasicObject`;
-        # see TODO note above.
-        #
-        def as_json(options={})
-          target.as_json(options)
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response.rb
deleted file mode 100644
index acb25669ea..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Contains modules and classes for wrapping the response from Elasticsearch
-    #
-    module Response
-
-      # Encapsulate the response returned from the Elasticsearch client
-      #
-      # Implements Enumerable and forwards its methods to the {#results} object.
-      #
-      class Response
-        attr_reader :klass, :search
-
-        include Enumerable
-
-        delegate :each, :empty?, :size, :slice, :[], :to_ary, to: :results
-
-        def initialize(klass, search, options={})
-          @klass     = klass
-          @search    = search
-        end
-
-        # Returns the Elasticsearch response
-        #
-        # @return [Hash]
-        #
-        def response
-          @response ||= HashWrapper.new(search.execute!)
-        end
-
-        # Returns the collection of "hits" from Elasticsearch
-        #
-        # @return [Results]
-        #
-        def results
-          @results ||= Results.new(klass, self)
-        end
-
-        # Returns the collection of records from the database
-        #
-        # @return [Records]
-        #
-        def records(options = {})
-          @records ||= Records.new(klass, self, options)
-        end
-
-        # Returns the "took" time
-        #
-        def took
-          raw_response['took']
-        end
-
-        # Returns whether the response timed out
-        #
-        def timed_out
-          raw_response['timed_out']
-        end
-
-        # Returns the statistics on shards
-        #
-        def shards
-          @shards ||= response['_shards']
-        end
-
-        # Returns a Hashie::Mash of the aggregations
-        #
-        def aggregations
-          @aggregations ||= Aggregations.new(raw_response['aggregations'])
-        end
-
-        # Returns a Hashie::Mash of the suggestions
-        #
-        def suggestions
-          @suggestions ||= Suggestions.new(raw_response['suggest'])
-        end
-
-        def raw_response
-          @raw_response ||= @response ? @response.to_hash : search.execute!
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/aggregations.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/aggregations.rb
deleted file mode 100644
index c2dd23c67d..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/aggregations.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      class Aggregations < HashWrapper
-        disable_warnings if respond_to?(:disable_warnings)
-
-        def initialize(attributes={})
-          __redefine_enumerable_methods super(attributes)
-        end
-
-        # Fix the problem of Hashie::Mash returning unexpected values for `min` and `max` methods
-        #
-        # People can define names for aggregations such as `min` and `max`, but these
-        # methods are defined in `Enumerable#min` and `Enumerable#max`
-        #
-        #     { foo: 'bar' }.min
-        #     # => [:foo, "bar"]
-        #
-        # Therefore, any Hashie::Mash instance value has the `min` and `max`
-        # methods redefined to return the real value
-        #
-        def __redefine_enumerable_methods(h)
-          if h.respond_to?(:each_pair)
-            h.each_pair { |k, v| v = __redefine_enumerable_methods(v) }
-          end
-          if h.is_a?(Hashie::Mash)
-            class << h
-              define_method(:min) { self[:min] }
-              define_method(:max) { self[:max] }
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/base.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/base.rb
deleted file mode 100644
index 827c52e357..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/base.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-      # Common funtionality for classes in the {Elasticsearch::Model::Response} module
-      #
-      module Base
-        attr_reader :klass, :response, :raw_response
-
-        # @param klass    [Class] The name of the model class
-        # @param response [Hash]  The full response returned from Elasticsearch client
-        # @param options  [Hash]  Optional parameters
-        #
-        def initialize(klass, response, options={})
-          @klass     = klass
-          @raw_response = response
-          @response = response
-        end
-
-        # @abstract Implement this method in specific class
-        #
-        def results
-          raise NotImplemented, "Implement this method in #{klass}"
-        end
-
-        # @abstract Implement this method in specific class
-        #
-        def records
-          raise NotImplemented, "Implement this method in #{klass}"
-        end
-
-        # Returns the total number of hits
-        #
-        def total
-          response.response['hits']['total']
-        end
-
-        # Returns the max_score
-        #
-        def max_score
-          response.response['hits']['max_score']
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination.rb
deleted file mode 100644
index 82f1301a56..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'elasticsearch/model/response/pagination/kaminari'
-require 'elasticsearch/model/response/pagination/will_paginate'
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/kaminari.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/kaminari.rb
deleted file mode 100644
index 5b1acfd9b1..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/kaminari.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      # Pagination for search results/records
-      #
-      module Pagination
-        # Allow models to be paginated with the "kaminari" gem [https://github.com/amatsuda/kaminari]
-        #
-        module Kaminari
-          def self.included(base)
-            # Include the Kaminari configuration and paging method in response
-            #
-            base.__send__ :include, ::Kaminari::ConfigurationMethods::ClassMethods
-            base.__send__ :include, ::Kaminari::PageScopeMethods
-
-            # Include the Kaminari paging methods in results and records
-            #
-            Elasticsearch::Model::Response::Results.__send__ :include, ::Kaminari::ConfigurationMethods::ClassMethods
-            Elasticsearch::Model::Response::Results.__send__ :include, ::Kaminari::PageScopeMethods
-            Elasticsearch::Model::Response::Records.__send__ :include, ::Kaminari::PageScopeMethods
-
-            Elasticsearch::Model::Response::Results.__send__ :delegate, :limit_value, :offset_value, :total_count, :max_pages, to: :response
-            Elasticsearch::Model::Response::Records.__send__ :delegate, :limit_value, :offset_value, :total_count, :max_pages, to: :response
-
-            base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              # Define the `page` Kaminari method
-              #
-              def #{::Kaminari.config.page_method_name}(num=nil)
-                @results  = nil
-                @records  = nil
-                @response = nil
-                @page     = [num.to_i, 1].max
-                @per_page ||= __default_per_page
-
-                self.search.definition.update size: @per_page,
-                                              from: @per_page * (@page - 1)
-
-                self
-              end
-            RUBY
-          end
-
-          # Returns the current "limit" (`size`) value
-          #
-          def limit_value
-            case
-            when search.definition[:size]
-              search.definition[:size]
-            else
-              __default_per_page
-            end
-          end
-
-          # Returns the current "offset" (`from`) value
-          #
-          def offset_value
-            case
-            when search.definition[:from]
-              search.definition[:from]
-            else
-              0
-            end
-          end
-
-          # Set the "limit" (`size`) value
-          #
-          def limit(value)
-            return self if value.to_i <= 0
-            @results  = nil
-            @records  = nil
-            @response = nil
-            @per_page = value.to_i
-
-            search.definition.update :size => @per_page
-            search.definition.update :from => @per_page * (@page - 1) if @page
-            self
-          end
-
-          # Set the "offset" (`from`) value
-          #
-          def offset(value)
-            return self if value.to_i < 0
-            @results  = nil
-            @records  = nil
-            @response = nil
-            @page     = nil
-            search.definition.update :from => value.to_i
-            self
-          end
-
-          # Returns the total number of results
-          #
-          def total_count
-            results.total
-          end
-
-          # Returns the models's `per_page` value or the default
-          #
-          # @api private
-          #
-          def __default_per_page
-            klass.respond_to?(:default_per_page) && klass.default_per_page || ::Kaminari.config.default_per_page
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/will_paginate.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/will_paginate.rb
deleted file mode 100644
index 7cfc36d0c7..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/pagination/will_paginate.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      # Pagination for search results/records
-      #
-      module Pagination
-
-
-        # Allow models to be paginated with the "will_paginate" gem [https://github.com/mislav/will_paginate]
-        #
-        module WillPaginate
-          def self.included(base)
-            base.__send__ :include, ::WillPaginate::CollectionMethods
-
-            # Include the paging methods in results and records
-            #
-            methods = [:current_page, :offset, :length, :per_page, :total_entries, :total_pages, :previous_page, :next_page, :out_of_bounds?]
-            Elasticsearch::Model::Response::Results.__send__ :delegate, *methods, to: :response
-            Elasticsearch::Model::Response::Records.__send__ :delegate, *methods, to: :response
-          end
-
-          def offset
-            (current_page - 1) * per_page
-          end
-
-          def length
-            search.definition[:size]
-          end
-
-          # Main pagination method
-          #
-          # @example
-          #
-          #     Article.search('foo').paginate(page: 1, per_page: 30)
-          #
-          def paginate(options)
-            param_name = options[:param_name] || :page
-            page       = [options[param_name].to_i, 1].max
-            per_page   = (options[:per_page] || __default_per_page).to_i
-
-            search.definition.update size: per_page,
-                                     from: (page - 1) * per_page
-            self
-          end
-
-          # Return the current page
-          #
-          def current_page
-            search.definition[:from] / per_page + 1 if search.definition[:from] && per_page
-          end
-
-          # Pagination method
-          #
-          # @example
-          #
-          #     Article.search('foo').page(2)
-          #
-          def page(num)
-            paginate(page: num, per_page: per_page) # shorthand
-          end
-
-          # Return or set the "size" value
-          #
-          # @example
-          #
-          #     Article.search('foo').per_page(15).page(2)
-          #
-          def per_page(num = nil)
-            if num.nil?
-              search.definition[:size]
-            else
-              paginate(page: current_page, per_page: num) # shorthand
-            end
-          end
-
-          # Returns the total number of results
-          #
-          def total_entries
-            results.total
-          end
-
-          # Returns the models's `per_page` value or the default
-          #
-          # @api private
-          #
-          def __default_per_page
-            klass.respond_to?(:per_page) && klass.per_page || ::WillPaginate.per_page
-          end
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/records.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/records.rb
deleted file mode 100644
index 4638ca6892..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/records.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      # Encapsulates the collection of records returned from the database
-      #
-      # Implements Enumerable and forwards its methods to the {#records} object,
-      # which is provided by an {Elasticsearch::Model::Adapter::Adapter} implementation.
-      #
-      class Records
-        include Enumerable
-
-        delegate :each, :empty?, :size, :slice, :[], :to_a, :to_ary, to: :records
-
-        attr_accessor :options
-
-        include Base
-
-        # @see Base#initialize
-        #
-        def initialize(klass, response, options={})
-          super
-
-          # Include module provided by the adapter in the singleton class ("metaclass")
-          #
-          adapter = Adapter.from_class(klass)
-          metaclass = class << self; self; end
-          metaclass.__send__ :include, adapter.records_mixin
-
-          self.options = options
-          self
-        end
-
-        # Returns the hit IDs
-        #
-        def ids
-          response.response['hits']['hits'].map { |hit| hit['_id'] }
-        end
-
-        # Returns the {Results} collection
-        #
-        def results
-          response.results
-        end
-
-        # Yields [record, hit] pairs to the block
-        #
-        def each_with_hit(&block)
-          records.to_a.zip(results).each(&block)
-        end
-
-        # Yields [record, hit] pairs and returns the result
-        #
-        def map_with_hit(&block)
-          records.to_a.zip(results).map(&block)
-        end
-
-        # Delegate methods to `@records`
-        #
-        def method_missing(method_name, *arguments)
-          records.respond_to?(method_name) ? records.__send__(method_name, *arguments) : super
-        end
-
-        # Respond to methods from `@records`
-        #
-        def respond_to?(method_name, include_private = false)
-          records.respond_to?(method_name) || super
-        end
-
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/result.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/result.rb
deleted file mode 100644
index 267ca6300a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/result.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      # Encapsulates the "hit" returned from the Elasticsearch client
-      #
-      # Wraps the raw Hash with in a `Hashie::Mash` instance, providing
-      # access to the Hash properties by calling Ruby methods.
-      #
-      # @see https://github.com/intridea/hashie
-      #
-      class Result
-
-        # @param attributes [Hash] A Hash with document properties
-        #
-        def initialize(attributes={})
-          @result = HashWrapper.new(attributes)
-        end
-
-        # Return document `_id` as `id`
-        #
-        def id
-          @result['_id']
-        end
-
-        # Return document `_type` as `_type`
-        #
-        def type
-          @result['_type']
-        end
-
-        # Delegate methods to `@result` or `@result._source`
-        #
-        def method_missing(name, *arguments)
-          case
-          when name.to_s.end_with?('?')
-            @result.__send__(name, *arguments) || ( @result._source && @result._source.__send__(name, *arguments) )
-          when @result.respond_to?(name)
-            @result.__send__ name, *arguments
-          when @result._source && @result._source.respond_to?(name)
-            @result._source.__send__ name, *arguments
-          else
-            super
-          end
-        end
-
-        # Respond to methods from `@result` or `@result._source`
-        #
-        def respond_to_missing?(method_name, include_private = false)
-          @result.respond_to?(method_name.to_sym) || \
-          @result._source && @result._source.respond_to?(method_name.to_sym) || \
-          super
-        end
-
-        def as_json(options={})
-          @result.as_json(options)
-        end
-
-        # TODO: #to_s, #inspect, with support for Pry
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/results.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/results.rb
deleted file mode 100644
index 006e66a46b..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/results.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      # Encapsulates the collection of documents returned from Elasticsearch
-      #
-      # Implements Enumerable and forwards its methods to the {#results} object.
-      #
-      class Results
-        include Base
-        include Enumerable
-
-        delegate :each, :empty?, :size, :slice, :[], :to_a, :to_ary, to: :results
-
-        # @see Base#initialize
-        #
-        def initialize(klass, response, options={})
-          super
-        end
-
-        # Returns the {Results} collection
-        #
-        def results
-          # TODO: Configurable custom wrapper
-          response.response['hits']['hits'].map { |hit| Result.new(hit) }
-        end
-
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/suggestions.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/suggestions.rb
deleted file mode 100644
index b2809bb12d..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/response/suggestions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Elasticsearch
-  module Model
-    module Response
-
-      class Suggestions < HashWrapper
-        disable_warnings if respond_to?(:disable_warnings)
-
-        def terms
-          self.to_a.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/searching.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/searching.rb
deleted file mode 100644
index 604657d5e0..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/searching.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Contains functionality related to searching.
-    #
-    module Searching
-
-      # Wraps a search request definition
-      #
-      class SearchRequest
-        attr_reader :klass, :definition, :options
-
-        # @param klass [Class] The class of the model
-        # @param query_or_payload [String,Hash,Object] The search request definition
-        #                                              (string, JSON, Hash, or object responding to `to_hash`)
-        # @param options [Hash] Optional parameters to be passed to the Elasticsearch client
-        #
-        def initialize(klass, query_or_payload, options={})
-          @klass   = klass
-          @options = options
-
-          __index_name    = options[:index] || klass.index_name
-          __document_type = options[:type]  || klass.document_type
-
-          case
-            # search query: ...
-            when query_or_payload.respond_to?(:to_hash)
-              body = query_or_payload.to_hash
-
-            # search '{ "query" : ... }'
-            when query_or_payload.is_a?(String) && query_or_payload =~ /^\s*{/
-              body = query_or_payload
-
-            # search '...'
-            else
-              q = query_or_payload
-          end
-
-          if body
-            @definition = { index: __index_name, type: __document_type, body: body }.update options
-          else
-            @definition = { index: __index_name, type: __document_type, q: q }.update options
-          end
-        end
-
-        # Performs the request and returns the response from client
-        #
-        # @return [Hash] The response from Elasticsearch
-        #
-        def execute!
-          klass.client.search(@definition)
-        end
-      end
-
-      module ClassMethods
-
-        # Provides a `search` method for the model to easily search within an index/type
-        # corresponding to the model settings.
-        #
-        # @param query_or_payload [String,Hash,Object] The search request definition
-        #                                              (string, JSON, Hash, or object responding to `to_hash`)
-        # @param options [Hash] Optional parameters to be passed to the Elasticsearch client
-        #
-        # @return [Elasticsearch::Model::Response::Response]
-        #
-        # @example Simple search in `Article`
-        #
-        #     Article.search 'foo'
-        #
-        # @example Search using a search definition as a Hash
-        #
-        #     response = Article.search \
-        #                  query: {
-        #                    match: {
-        #                      title: 'foo'
-        #                    }
-        #                  },
-        #                  highlight: {
-        #                    fields: {
-        #                      title: {}
-        #                    }
-        #                  },
-        #                  size: 50
-        #
-        #     response.results.first.title
-        #     # => "Foo"
-        #
-        #     response.results.first.highlight.title
-        #     # => ["<em>Foo</em>"]
-        #
-        #     response.records.first.title
-        #     #  Article Load (0.2ms)  SELECT "articles".* FROM "articles" WHERE "articles"."id" IN (1, 3)
-        #     # => "Foo"
-        #
-        # @example Search using a search definition as a JSON string
-        #
-        #     Article.search '{"query" : { "match_all" : {} }}'
-        #
-        def search(query_or_payload, options={})
-          search   = SearchRequest.new(self, query_or_payload, options)
-
-          Response::Response.new(self, search)
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/serializing.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/serializing.rb
deleted file mode 100644
index 659a58bb2a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/serializing.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Elasticsearch
-  module Model
-
-    # Contains functionality for serializing model instances for the client
-    #
-    module Serializing
-
-      module ClassMethods
-      end
-
-      module InstanceMethods
-
-        # Serialize the record as a Hash, to be passed to the client.
-        #
-        # Re-define this method to customize the serialization.
-        #
-        # @return [Hash]
-        #
-        # @example Return the model instance as a Hash
-        #
-        #     Article.first.__elasticsearch__.as_indexed_json
-        #     => {"title"=>"Foo"}
-        #
-        # @see Elasticsearch::Model::Indexing
-        #
-        def as_indexed_json(options={})
-          # TODO: Play with the `MyModel.indexes` method -- reject non-mapped attributes, `:as` options, etc
-          self.as_json(options.merge root: false)
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/version.rb b/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/version.rb
deleted file mode 100644
index 6d63d48775..0000000000
--- a/elasticsearch-rails/elasticsearch-model/lib/elasticsearch/model/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Elasticsearch
-  module Model
-    VERSION = '6.1.0'
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapter_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapter_spec.rb
deleted file mode 100644
index 71fd2e6b5e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapter_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter do
-
-  before(:all) do
-    class ::DummyAdapterClass; end
-    class ::DummyAdapterClassWithAdapter; end
-    class ::DummyAdapter
-      Records   = Module.new
-      Callbacks = Module.new
-      Importing = Module.new
-    end
-  end
-
-  after(:all) do
-    [DummyAdapterClassWithAdapter, DummyAdapterClass, DummyAdapter].each do |adapter|
-      Elasticsearch::Model::Adapter::Adapter.adapters.delete(adapter)
-    end
-    remove_classes(DummyAdapterClass, DummyAdapterClassWithAdapter, DummyAdapter)
-  end
-
-  describe '#from_class' do
-
-    it 'should return an Adapter instance' do
-      expect(Elasticsearch::Model::Adapter.from_class(DummyAdapterClass)).to be_a(Elasticsearch::Model::Adapter::Adapter)
-    end
-  end
-
-  describe 'register' do
-
-    before do
-      expect(Elasticsearch::Model::Adapter::Adapter).to receive(:register).and_call_original
-      Elasticsearch::Model::Adapter.register(:foo, lambda { |c| false })
-    end
-
-    it 'should register an adapter' do
-      expect(Elasticsearch::Model::Adapter::Adapter.adapters[:foo]).to be_a(Proc)
-    end
-
-    context 'when a specific adapter class is set' do
-
-      before do
-        expect(Elasticsearch::Model::Adapter::Adapter).to receive(:register).and_call_original
-        Elasticsearch::Model::Adapter::Adapter.register(DummyAdapter,
-                                                        lambda { |c| c == DummyAdapterClassWithAdapter })
-      end
-
-      let(:adapter) do
-        Elasticsearch::Model::Adapter::Adapter.new(DummyAdapterClassWithAdapter)
-      end
-
-      it 'should register the adapter' do
-        expect(adapter.adapter).to eq(DummyAdapter)
-      end
-    end
-  end
-
-  describe 'default adapter' do
-
-    let(:adapter) do
-      Elasticsearch::Model::Adapter::Adapter.new(DummyAdapterClass)
-    end
-
-    it 'sets a default adapter' do
-      expect(adapter.adapter).to eq(Elasticsearch::Model::Adapter::Default)
-    end
-  end
-
-  describe '#records_mixin' do
-
-    before do
-      Elasticsearch::Model::Adapter::Adapter.register(DummyAdapter,
-                                                      lambda { |c| c == DummyAdapterClassWithAdapter })
-
-    end
-
-    let(:adapter) do
-      Elasticsearch::Model::Adapter::Adapter.new(DummyAdapterClassWithAdapter)
-    end
-
-    it 'returns a Module' do
-      expect(adapter.records_mixin).to be_a(Module)
-    end
-  end
-
-  describe '#callbacks_mixin' do
-
-    before do
-      Elasticsearch::Model::Adapter::Adapter.register(DummyAdapter,
-                                                      lambda { |c| c == DummyAdapterClassWithAdapter })
-
-    end
-
-    let(:adapter) do
-      Elasticsearch::Model::Adapter::Adapter.new(DummyAdapterClassWithAdapter)
-    end
-
-    it 'returns a Module' do
-      expect(adapter.callbacks_mixin).to be_a(Module)
-    end
-  end
-
-  describe '#importing_mixin' do
-
-    before do
-      Elasticsearch::Model::Adapter::Adapter.register(DummyAdapter,
-                                                      lambda { |c| c == DummyAdapterClassWithAdapter })
-
-    end
-
-    let(:adapter) do
-      Elasticsearch::Model::Adapter::Adapter.new(DummyAdapterClassWithAdapter)
-    end
-
-    it 'returns a Module' do
-      expect(adapter.importing_mixin).to be_a(Module)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/associations_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/associations_spec.rb
deleted file mode 100644
index 0cfed6432e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/associations_spec.rb
+++ /dev/null
@@ -1,334 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Associations' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(version: 1) do
-      create_table :categories do |t|
-        t.string     :title
-        t.timestamps null: false
-      end
-
-      create_table :categories_posts do |t|
-        t.references :post, :category
-      end
-
-      create_table :authors do |t|
-        t.string     :first_name, :last_name
-        t.timestamps null: false
-      end
-
-      create_table :authorships do |t|
-        t.string     :first_name, :last_name
-        t.references :post
-        t.references :author
-        t.timestamps null: false
-      end
-
-      create_table :comments do |t|
-        t.string     :text
-        t.string     :author
-        t.references :post
-        t.timestamps null: false
-      end
-
-      add_index(:comments, :post_id) unless index_exists?(:comments, :post_id)
-
-      create_table :posts do |t|
-        t.string     :title
-        t.text       :text
-        t.boolean    :published
-        t.timestamps null: false
-      end
-    end
-
-    Comment.__send__ :include, Elasticsearch::Model
-    Comment.__send__ :include, Elasticsearch::Model::Callbacks
-  end
-
-  before do
-    clear_tables(:categories, :categories_posts, :authors, :authorships, :comments, :posts)
-    clear_indices(Post)
-    Post.__elasticsearch__.create_index!(force: true)
-    Comment.__elasticsearch__.create_index!(force: true)
-  end
-
-  after do
-    clear_tables(Post, Category)
-    clear_indices(Post)
-  end
-
-  context 'when a document is created' do
-
-    before do
-      Post.create!(title: 'Test')
-      Post.create!(title: 'Testing Coding')
-      Post.create!(title: 'Coding')
-      Post.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Post.search('title:test')
-    end
-
-    it 'indexes the document' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.results.first.title).to eq('Test')
-      expect(search_result.records.size).to eq(2)
-      expect(search_result.records.first.title).to eq('Test')
-    end
-  end
-
-  describe 'has_many_and_belongs_to association' do
-
-      context 'when an association is updated' do
-
-      before do
-        post.categories = [category_a,  category_b]
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      let(:category_a) do
-        Category.where(title: "One").first_or_create!
-      end
-
-      let(:category_b) do
-        Category.where(title: "Two").first_or_create!
-      end
-
-      let(:post) do
-        Post.create! title: "First Post", text: "This is the first post..."
-      end
-
-      let(:search_result) do
-        Post.search(query: {
-            bool: {
-                must: {
-                    multi_match: {
-                        fields: ['title'],
-                        query: 'first'
-                    }
-                },
-                filter: {
-                    terms: {
-                        categories: ['One']
-                    }
-                }
-            }
-        } )
-      end
-
-      it 'applies the update with' do
-        expect(search_result.results.size).to eq(1)
-        expect(search_result.results.first.title).to eq('First Post')
-        expect(search_result.records.size).to eq(1)
-        expect(search_result.records.first.title).to eq('First Post')
-      end
-    end
-
-    context 'when an association is deleted' do
-
-      before do
-        post.categories = [category_a,  category_b]
-        post.categories = [category_b]
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      let(:category_a) do
-        Category.where(title: "One").first_or_create!
-      end
-
-      let(:category_b) do
-        Category.where(title: "Two").first_or_create!
-      end
-
-      let(:post) do
-        Post.create! title: "First Post", text: "This is the first post..."
-      end
-
-      let(:search_result) do
-        Post.search(query: {
-            bool: {
-                must: {
-                    multi_match: {
-                        fields: ['title'],
-                        query: 'first'
-                    }
-                },
-                filter: {
-                    terms: {
-                        categories: ['One']
-                    }
-                }
-            }
-        } )
-      end
-
-      it 'applies the update with a reindex' do
-        expect(search_result.results.size).to eq(0)
-        expect(search_result.records.size).to eq(0)
-      end
-    end
-  end
-
-  describe 'has_many through association' do
-
-    context 'when the association is updated' do
-
-      before do
-        author_a = Author.where(first_name: "John", last_name: "Smith").first_or_create!
-        author_b = Author.where(first_name: "Mary", last_name: "Smith").first_or_create!
-        author_c = Author.where(first_name: "Kobe", last_name: "Griss").first_or_create!
-
-        # Create posts
-        post_1 = Post.create!(title: "First Post", text: "This is the first post...")
-        post_2 = Post.create!(title: "Second Post", text: "This is the second post...")
-        post_3 = Post.create!(title: "Third Post", text: "This is the third post...")
-
-        # Assign authors
-        post_1.authors = [author_a,  author_b]
-        post_2.authors = [author_a]
-        post_3.authors = [author_c]
-
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      context 'if active record is at least 4' do
-
-        let(:search_result) do
-          Post.search('authors.full_name:john')
-        end
-
-        it 'applies the update', if: active_record_at_least_4? do
-          expect(search_result.results.size).to eq(2)
-          expect(search_result.records.size).to eq(2)
-        end
-      end
-
-      context 'if active record is less than 4' do
-
-        let(:search_result) do
-          Post.search('authors.author.full_name:john')
-        end
-
-        it 'applies the update', if: !active_record_at_least_4? do
-          expect(search_result.results.size).to eq(2)
-          expect(search_result.records.size).to eq(2)
-        end
-      end
-    end
-
-    context 'when an association is added', if: active_record_at_least_4? do
-
-      before do
-        author_a = Author.where(first_name: "John", last_name: "Smith").first_or_create!
-        author_b = Author.where(first_name: "Mary", last_name: "Smith").first_or_create!
-
-        # Create posts
-        post_1 = Post.create!(title: "First Post", text: "This is the first post...")
-
-        # Assign authors
-        post_1.authors = [author_a]
-        post_1.authors << author_b
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      let(:search_result) do
-        Post.search('authors.full_name:john')
-      end
-
-      it 'adds the association' do
-        expect(search_result.results.size).to eq(1)
-        expect(search_result.records.size).to eq(1)
-      end
-    end
-  end
-
-  describe 'has_many association' do
-
-    context 'when an association is added', if: active_record_at_least_4? do
-
-      before do
-        # Create posts
-        post_1 = Post.create!(title: "First Post", text: "This is the first post...")
-        post_2 = Post.create!(title: "Second Post", text: "This is the second post...")
-
-        # Add comments
-        post_1.comments.create!(author: 'John', text: 'Excellent')
-        post_1.comments.create!(author: 'Abby', text: 'Good')
-
-        post_2.comments.create!(author: 'John', text: 'Terrible')
-
-        post_1.comments.create!(author: 'John', text: 'Or rather just good...')
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      let(:search_result) do
-        Post.search(query: {
-            nested: {
-                path: 'comments',
-                query: {
-                    bool: {
-                        must: [
-                            { match: { 'comments.author' => 'john' } },
-                            { match: { 'comments.text'   => 'good' } }
-                        ]
-                    }
-                }
-            }
-        })
-      end
-
-      it 'adds the association' do
-        expect(search_result.results.size).to eq(1)
-      end
-    end
-  end
-
-  describe '#touch' do
-
-    context 'when a touch callback is defined on the model' do
-
-      before do
-        # Create categories
-        category_a = Category.where(title: "One").first_or_create!
-
-        # Create post
-        post = Post.create!(title: "First Post", text: "This is the first post...")
-
-        # Assign category
-        post.categories << category_a
-        category_a.update_attribute(:title, "Updated")
-        category_a.posts.each { |p| p.touch }
-
-        Post.__elasticsearch__.refresh_index!
-      end
-
-      it 'executes the callback after #touch' do
-        expect(Post.search('categories:One').size).to eq(0)
-        expect(Post.search('categories:Updated').size).to eq(1)
-      end
-    end
-  end
-
-  describe '#includes' do
-
-    before do
-      post_1 = Post.create(title: 'One')
-      post_2 = Post.create(title: 'Two')
-      post_1.comments.create(text: 'First comment')
-      post_2.comments.create(text: 'Second comment')
-
-      Comment.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Comment.search('first').records(includes: :post)
-    end
-
-    it 'eager loads associations' do
-      expect(search_result.first.association(:post)).to be_loaded
-      expect(search_result.first.post.title).to eq('One')
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/basic_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/basic_spec.rb
deleted file mode 100644
index a4d9c05c5a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/basic_spec.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::ActiveRecord do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :articles do |t|
-        t.string   :title
-        t.string   :body
-        t.integer  :clicks, :default => 0
-        t.datetime :created_at, :default => 'NOW()'
-      end
-    end
-
-    Article.delete_all
-    Article.__elasticsearch__.create_index!(force: true)
-
-    Article.create!(title: 'Test', body: '', clicks: 1)
-    Article.create!(title: 'Testing Coding', body: '', clicks: 2)
-    Article.create!(title: 'Coding', body: '', clicks: 3)
-
-    Article.__elasticsearch__.refresh_index!
-  end
-
-  describe 'indexing a document' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'allows searching for documents' do
-      expect(search_result.results.size).to be(2)
-      expect(search_result.records.size).to be(2)
-    end
-  end
-
-  describe '#results' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'returns an instance of Response::Result' do
-      expect(search_result.results.first).to be_a(Elasticsearch::Model::Response::Result)
-    end
-
-    it 'prooperly loads the document' do
-      expect(search_result.results.first.title).to eq('Test')
-    end
-
-    context 'when the result contains other data' do
-
-      let(:search_result) do
-        Article.search(query: { match: { title: 'test' } }, highlight: { fields: { title: {} } })
-      end
-
-      it 'allows access to the Elasticsearch result' do
-        expect(search_result.results.first.title).to eq('Test')
-        expect(search_result.results.first.title?).to be(true)
-        expect(search_result.results.first.boo?).to be(false)
-        expect(search_result.results.first.highlight?).to be(true)
-        expect(search_result.results.first.highlight.title?).to be(true)
-        expect(search_result.results.first.highlight.boo?).to be(false)
-      end
-    end
-  end
-
-  describe '#records' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'returns an instance of the model' do
-      expect(search_result.records.first).to be_a(Article)
-    end
-
-    it 'prooperly loads the document' do
-      expect(search_result.records.first.title).to eq('Test')
-    end
-  end
-
-  describe 'Enumerable' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'allows iteration over results' do
-      expect(search_result.results.map(&:_id)).to eq(['1', '2'])
-    end
-
-    it 'allows iteration over records' do
-      expect(search_result.records.map(&:id)).to eq([1, 2])
-    end
-  end
-
-  describe '#id' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'returns the id' do
-      expect(search_result.results.first.id).to eq('1')
-    end
-  end
-
-  describe '#id' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'returns the type' do
-      expect(search_result.results.first.type).to eq('article')
-    end
-  end
-
-  describe '#each_with_hit' do
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'returns the record with the Elasticsearch hit' do
-      search_result.records.each_with_hit do |r, h|
-        expect(h._score).not_to be_nil
-        expect(h._source.title).not_to be_nil
-      end
-    end
-  end
-
-  describe 'search results order' do
-
-    let(:search_result) do
-      Article.search(query: { match: { title: 'code' }}, sort: { clicks: :desc })
-    end
-
-    it 'preserves the search results order when accessing a single record' do
-      expect(search_result.records[0].clicks).to be(3)
-      expect(search_result.records[1].clicks).to be(2)
-      expect(search_result.records.first).to eq(search_result.records[0])
-    end
-
-    it 'preserves the search results order for the list of records' do
-      search_result.records.each_with_hit do |r, h|
-        expect(r.id.to_s).to eq(h._id)
-      end
-
-      search_result.records.map_with_hit do |r, h|
-        expect(r.id.to_s).to eq(h._id)
-      end
-    end
-  end
-
-  describe 'a paged collection' do
-
-    let(:search_result) do
-      Article.search(query: { match: { title: { query: 'test' } } },
-                     size: 2,
-                     from: 1)
-    end
-
-    it 'applies the paged options to the search' do
-      expect(search_result.results.size).to eq(1)
-      expect(search_result.results.first.title).to eq('Testing Coding')
-      expect(search_result.records.size).to eq(1)
-      expect(search_result.records.first.title).to eq('Testing Coding')
-    end
-  end
-
-  describe '#destroy' do
-
-    before do
-      Article.create!(title: 'destroy', body: '', clicks: 1)
-      Article.__elasticsearch__.refresh_index!
-      Article.where(title: 'destroy').first.destroy
-
-      Article.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Article.search('title:test')
-    end
-
-    it 'removes the document from the index' do
-      expect(Article.count).to eq(3)
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-  end
-
-  describe 'full document updates' do
-
-    before do
-      article = Article.create!(title: 'update', body: '', clicks: 1)
-      Article.__elasticsearch__.refresh_index!
-      article.title = 'Writing'
-      article.save
-
-      Article.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Article.search('title:write')
-    end
-
-    it 'applies the update' do
-      expect(search_result.results.size).to eq(1)
-      expect(search_result.records.size).to eq(1)
-    end
-  end
-
-  describe 'attribute updates' do
-
-    before do
-      article = Article.create!(title: 'update', body: '', clicks: 1)
-      Article.__elasticsearch__.refresh_index!
-      article.title = 'special'
-      article.save
-
-      Article.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Article.search('title:special')
-    end
-
-    it 'applies the update' do
-      expect(search_result.results.size).to eq(1)
-      expect(search_result.records.size).to eq(1)
-    end
-  end
-
-  describe '#save' do
-
-    before do
-      article = Article.create!(title: 'save', body: '', clicks: 1)
-
-      ActiveRecord::Base.transaction do
-        article.body = 'dummy'
-        article.save
-
-        article.title = 'special'
-        article.save
-      end
-
-      article.__elasticsearch__.update_document
-      Article.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Article.search('body:dummy')
-    end
-
-    it 'applies the save' do
-      expect(search_result.results.size).to eq(1)
-      expect(search_result.records.size).to eq(1)
-    end
-  end
-
-  describe 'a DSL search' do
-
-    let(:search_result) do
-      Article.search(query: { match: { title: { query: 'test' } } })
-    end
-
-    it 'returns the results' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-  end
-
-  describe 'chaining SQL queries on response.records' do
-
-    let(:search_result) do
-      Article.search(query: { match: { title: { query: 'test' } } })
-    end
-
-    it 'executes the SQL request with the chained query criteria' do
-      expect(search_result.records.size).to eq(2)
-      expect(search_result.records.where(title: 'Test').size).to eq(1)
-      expect(search_result.records.where(title: 'Test').first.title).to eq('Test')
-    end
-  end
-
-  describe 'ordering of SQL queries' do
-
-    context 'when order is called on the ActiveRecord query' do
-
-      let(:search_result) do
-        Article.search query: { match: { title: { query: 'test' } } }
-      end
-
-      it 'allows the SQL query to be ordered independent of the Elasticsearch results order', unless: active_record_at_least_4? do
-        expect(search_result.records.order('title DESC').first.title).to eq('Testing Coding')
-        expect(search_result.records.order('title DESC')[0].title).to eq('Testing Coding')
-      end
-
-      it 'allows the SQL query to be ordered independent of the Elasticsearch results order', if: active_record_at_least_4? do
-        expect(search_result.records.order(title: :desc).first.title).to eq('Testing Coding')
-        expect(search_result.records.order(title: :desc)[0].title).to eq('Testing Coding')
-      end
-    end
-
-    context 'when more methods are chained on the ActiveRecord query' do
-
-      let(:search_result) do
-        Article.search query: {match: {title: {query: 'test'}}}
-      end
-
-      it 'allows the SQL query to be ordered independent of the Elasticsearch results order', if: active_record_at_least_4? do
-        expect(search_result.records.distinct.order(title: :desc).first.title).to eq('Testing Coding')
-        expect(search_result.records.distinct.order(title: :desc)[0].title).to eq('Testing Coding')
-      end
-    end
-  end
-
-  describe 'access to the response via methods' do
-
-    let(:search_result) do
-      Article.search(query: { match: { title: { query: 'test' } } },
-                     aggregations: {
-                         dates: { date_histogram: { field: 'created_at', interval: 'hour' } },
-                         clicks: { global: {}, aggregations: { min: { min: { field: 'clicks' } } } }
-                     },
-                     suggest: { text: 'tezt', title: { term: { field: 'title', suggest_mode: 'always' } } })
-    end
-
-    it 'allows document keys to be access via methods' do
-      expect(search_result.aggregations.dates.buckets.first.doc_count).to eq(2)
-      expect(search_result.aggregations.clicks.doc_count).to eq(6)
-      expect(search_result.aggregations.clicks.min.value).to eq(1.0)
-      expect(search_result.aggregations.clicks.max).to be_nil
-      expect(search_result.suggestions.title.first.options.size).to eq(1)
-      expect(search_result.suggestions.terms).to eq(['test'])
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/dynamic_index_name_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/dynamic_index_name_spec.rb
deleted file mode 100644
index 1a116ec7d1..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/dynamic_index_name_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Dynamic Index naming' do
-
-  before do
-    ArticleWithDynamicIndexName.counter = 0
-  end
-
-  it 'exavlues the index_name value' do
-    expect(ArticleWithDynamicIndexName.index_name).to eq('articles-1')
-  end
-
-  it 'revaluates the index name with each call' do
-    expect(ArticleWithDynamicIndexName.index_name).to eq('articles-1')
-    expect(ArticleWithDynamicIndexName.index_name).to eq('articles-2')
-    expect(ArticleWithDynamicIndexName.index_name).to eq('articles-3')
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/import_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/import_spec.rb
deleted file mode 100644
index 52301b01a1..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/import_spec.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :import_articles do |t|
-        t.string   :title
-        t.integer  :views
-        t.string   :numeric # For the sake of invalid data sent to Elasticsearch
-        t.datetime :created_at, :default => 'NOW()'
-      end
-    end
-
-    ImportArticle.delete_all
-    ImportArticle.__elasticsearch__.client.cluster.health(wait_for_status: 'yellow')
-  end
-
-  before do
-    ImportArticle.__elasticsearch__.create_index!
-  end
-
-  after do
-    clear_indices(ImportArticle)
-    clear_tables(ImportArticle)
-  end
-
-  describe '#import' do
-
-    context 'when no search criteria is specified' do
-
-      before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.import
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'imports all documents' do
-        expect(ImportArticle.search('*').results.total).to eq(10)
-      end
-    end
-
-    context 'when batch size is specified' do
-
-      before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-      end
-
-      let!(:batch_count) do
-        batches = 0
-        errors  = ImportArticle.import(batch_size: 5) do |response|
-          batches += 1
-        end
-        ImportArticle.__elasticsearch__.refresh_index!
-        batches
-      end
-
-      it 'imports using the batch size' do
-        expect(batch_count).to eq(2)
-      end
-
-      it 'imports all the documents' do
-        expect(ImportArticle.search('*').results.total).to eq(10)
-      end
-    end
-
-    context 'when a scope is specified' do
-
-      before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.import(scope: 'popular', force: true)
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'applies the scope' do
-        expect(ImportArticle.search('*').results.total).to eq(5)
-      end
-    end
-
-    context 'when a query is specified' do
-
-      before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.import(query: -> { where('views >= 3') })
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'applies the query' do
-        expect(ImportArticle.search('*').results.total).to eq(7)
-      end
-    end
-
-    context 'when there are invalid documents' do
-
-      let!(:result) do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        new_article
-        batches = 0
-        errors  = ImportArticle.__elasticsearch__.import(batch_size: 5) do |response|
-          batches += 1
-        end
-        ImportArticle.__elasticsearch__.refresh_index!
-        { batch_size: batches, errors: errors}
-      end
-
-      let(:new_article) do
-        ImportArticle.create!(title: "Test INVALID", numeric: "INVALID")
-      end
-
-      it 'does not import them' do
-        expect(ImportArticle.search('*').results.total).to eq(10)
-        expect(result[:batch_size]).to eq(3)
-        expect(result[:errors]).to eq(1)
-      end
-    end
-
-    context 'when a transform proc is specified' do
-
-      before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.import( transform: ->(a) {{ index: { data: { name: a.title, foo: 'BAR' } }}} )
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'transforms the documents' do
-        expect(ImportArticle.search('*').results.first._source.keys).to include('name')
-        expect(ImportArticle.search('*').results.first._source.keys).to include('foo')
-      end
-
-      it 'imports all documents' do
-        expect(ImportArticle.search('test').results.total).to eq(10)
-        expect(ImportArticle.search('bar').results.total).to eq(10)
-      end
-    end
-
-    context 'when the model has a default scope' do
-
-      around(:all) do |example|
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.instance_eval { default_scope { where('views > 3') } }
-        example.run
-        ImportArticle.default_scopes.pop
-      end
-
-      before do
-        ImportArticle.__elasticsearch__.import
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'uses the default scope' do
-        expect(ImportArticle.search('*').results.total).to eq(6)
-      end
-    end
-
-    context 'when there is a default scope and a query specified' do
-
-      around(:all) do |example|
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
-        ImportArticle.instance_eval { default_scope { where('views > 3') } }
-        example.run
-        ImportArticle.default_scopes.pop
-      end
-
-      before do
-        ImportArticle.import(query: -> { where('views <= 4') })
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'combines the query and the default scope' do
-        expect(ImportArticle.search('*').results.total).to eq(1)
-      end
-    end
-
-    context 'when the batch is empty' do
-
-      before do
-        ImportArticle.delete_all
-        ImportArticle.import
-        ImportArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'does not make any requests to create documents' do
-        expect(ImportArticle.search('*').results.total).to eq(0)
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/multi_model_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/multi_model_spec.rb
deleted file mode 100644
index 96c65fc5c4..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/multi_model_spec.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord MultiModel' do
-
-  before(:all) do
-    ActiveRecord::Schema.define do
-      create_table Episode.table_name do |t|
-        t.string :name
-        t.datetime :created_at, :default => 'NOW()'
-      end
-
-      create_table Series.table_name do |t|
-        t.string :name
-        t.datetime :created_at, :default => 'NOW()'
-      end
-    end
-  end
-
-  before do
-    models = [ Episode, Series ]
-    clear_tables(models)
-    models.each do |model|
-      model.__elasticsearch__.create_index! force: true
-      model.create name: "The #{model.name}"
-      model.create name: "A great #{model.name}"
-      model.create name: "The greatest #{model.name}"
-      model.__elasticsearch__.refresh_index!
-    end
-  end
-
-  after do
-    clear_indices(Episode, Series)
-    clear_tables(Episode, Series)
-  end
-
-  context 'when the search is across multimodels' do
-
-    let(:search_result) do
-      Elasticsearch::Model.search(%q<"The greatest Episode"^2 OR "The greatest Series">, [Series, Episode])
-    end
-
-    it 'executes the search across models' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-
-    describe '#results' do
-
-      it 'returns an instance of Elasticsearch::Model::Response::Result' do
-        expect(search_result.results[0]).to be_a(Elasticsearch::Model::Response::Result)
-        expect(search_result.results[1]).to be_a(Elasticsearch::Model::Response::Result)
-      end
-
-      it 'returns the correct model instance' do
-        expect(search_result.results[0].name).to eq('The greatest Episode')
-        expect(search_result.results[1].name).to eq('The greatest Series')
-      end
-
-      it 'provides access to the results' do
-        expect(search_result.results[0].name).to eq('The greatest Episode')
-        expect(search_result.results[0].name?).to be(true)
-        expect(search_result.results[0].boo?).to be(false)
-
-        expect(search_result.results[1].name).to eq('The greatest Series')
-        expect(search_result.results[1].name?).to be(true)
-        expect(search_result.results[1].boo?).to be(false)
-      end
-    end
-
-    describe '#records' do
-
-      it 'returns an instance of Elasticsearch::Model::Response::Result' do
-        expect(search_result.records[0]).to be_a(Episode)
-        expect(search_result.records[1]).to be_a(Series)
-      end
-
-      it 'returns the correct model instance' do
-        expect(search_result.records[0].name).to eq('The greatest Episode')
-        expect(search_result.records[1].name).to eq('The greatest Series')
-      end
-
-      context 'when the data store is changed' do
-
-        before do
-          Series.find_by_name("The greatest Series").delete
-          Series.__elasticsearch__.refresh_index!
-        end
-
-        it 'only returns matching records' do
-          expect(search_result.results.size).to eq(2)
-          expect(search_result.records.size).to eq(1  )
-          expect(search_result.records[0].name).to eq('The greatest Episode')
-        end
-      end
-    end
-
-    describe 'pagination' do
-
-      let(:search_result) do
-        Elasticsearch::Model.search('series OR episode', [Series, Episode])
-      end
-
-      it 'properly paginates the results' do
-        expect(search_result.page(1).per(3).results.size).to eq(3)
-        expect(search_result.page(2).per(3).results.size).to eq(3)
-        expect(search_result.page(3).per(3).results.size).to eq(0)
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb
deleted file mode 100644
index ea426d3f28..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Namespaced Model' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :books do |t|
-        t.string   :title
-      end
-    end
-
-    MyNamespace::Book.delete_all
-    MyNamespace::Book.__elasticsearch__.create_index!(force: true)
-    MyNamespace::Book.create!(title: 'Test')
-    MyNamespace::Book.__elasticsearch__.refresh_index!
-  end
-
-  after do
-    clear_indices(MyNamespace::Book)
-    clear_tables(MyNamespace::Book)
-  end
-
-  context 'when the model is namespaced' do
-
-    it 'has the proper index name' do
-      expect(MyNamespace::Book.index_name).to eq('my_namespace-books')
-    end
-
-    it 'has the proper document type' do
-      expect(MyNamespace::Book.document_type).to eq('book')
-    end
-
-    it 'saves the document into the index' do
-      expect(MyNamespace::Book.search('title:test').results.size).to eq(1)
-      expect(MyNamespace::Book.search('title:test').results.first.title).to eq('Test')
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/pagination_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/pagination_spec.rb
deleted file mode 100644
index 9427fae48e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/pagination_spec.rb
+++ /dev/null
@@ -1,315 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Pagination' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table ArticleForPagination.table_name do |t|
-        t.string   :title
-        t.datetime :created_at, :default => 'NOW()'
-        t.boolean  :published
-      end
-    end
-
-    Kaminari::Hooks.init if defined?(Kaminari::Hooks)
-
-    ArticleForPagination.__elasticsearch__.create_index! force: true
-
-    68.times do |i|
-      ArticleForPagination.create! title: "Test #{i}", published: (i % 2 == 0)
-    end
-
-    ArticleForPagination.import
-    ArticleForPagination.__elasticsearch__.refresh_index!
-  end
-
-  context 'when no other page is specified' do
-
-    let(:records) do
-      ArticleForPagination.search('title:test').page(1).records
-    end
-
-    describe '#size' do
-
-      it 'returns the correct size' do
-        expect(records.size).to eq(25)
-      end
-    end
-
-    describe '#current_page' do
-
-      it 'returns the correct current page' do
-        expect(records.current_page).to eq(1)
-      end
-    end
-
-    describe '#prev_page' do
-
-      it 'returns the correct previous page' do
-        expect(records.prev_page).to be_nil
-      end
-    end
-
-    describe '#next_page' do
-
-      it 'returns the correct next page' do
-        expect(records.next_page).to eq(2)
-      end
-    end
-
-    describe '#total_pages' do
-
-      it 'returns the correct total pages' do
-        expect(records.total_pages).to eq(3)
-      end
-    end
-
-    describe '#first_page?' do
-
-      it 'returns the correct first page' do
-        expect(records.first_page?).to be(true)
-      end
-    end
-
-    describe '#last_page?' do
-
-      it 'returns the correct last page' do
-        expect(records.last_page?).to be(false)
-      end
-    end
-
-    describe '#out_of_range?' do
-
-      it 'returns whether the pagination is out of range' do
-        expect(records.out_of_range?).to be(false)
-      end
-    end
-  end
-
-  context 'when a specific page is specified' do
-
-    let(:records) do
-      ArticleForPagination.search('title:test').page(2).records
-    end
-
-    describe '#size' do
-
-      it 'returns the correct size' do
-        expect(records.size).to eq(25)
-      end
-    end
-
-    describe '#current_page' do
-
-      it 'returns the correct current page' do
-        expect(records.current_page).to eq(2)
-      end
-    end
-
-    describe '#prev_page' do
-
-      it 'returns the correct previous page' do
-        expect(records.prev_page).to eq(1)
-      end
-    end
-
-    describe '#next_page' do
-
-      it 'returns the correct next page' do
-        expect(records.next_page).to eq(3)
-      end
-    end
-
-    describe '#total_pages' do
-
-      it 'returns the correct total pages' do
-        expect(records.total_pages).to eq(3)
-      end
-    end
-
-    describe '#first_page?' do
-
-      it 'returns the correct first page' do
-        expect(records.first_page?).to be(false)
-      end
-    end
-
-    describe '#last_page?' do
-
-      it 'returns the correct last page' do
-        expect(records.last_page?).to be(false)
-      end
-    end
-
-    describe '#out_of_range?' do
-
-      it 'returns whether the pagination is out of range' do
-        expect(records.out_of_range?).to be(false)
-      end
-    end
-  end
-
-  context 'when a the last page is specified' do
-
-    let(:records) do
-      ArticleForPagination.search('title:test').page(3).records
-    end
-
-    describe '#size' do
-
-      it 'returns the correct size' do
-        expect(records.size).to eq(18)
-      end
-    end
-
-    describe '#current_page' do
-
-      it 'returns the correct current page' do
-        expect(records.current_page).to eq(3)
-      end
-    end
-
-    describe '#prev_page' do
-
-      it 'returns the correct previous page' do
-        expect(records.prev_page).to eq(2)
-      end
-    end
-
-    describe '#next_page' do
-
-      it 'returns the correct next page' do
-        expect(records.next_page).to be_nil
-      end
-    end
-
-    describe '#total_pages' do
-
-      it 'returns the correct total pages' do
-        expect(records.total_pages).to eq(3)
-      end
-    end
-
-    describe '#first_page?' do
-
-      it 'returns the correct first page' do
-        expect(records.first_page?).to be(false)
-      end
-    end
-
-    describe '#last_page?' do
-
-      it 'returns the correct last page' do
-        expect(records.last_page?).to be(true)
-      end
-    end
-
-    describe '#out_of_range?' do
-
-      it 'returns whether the pagination is out of range' do
-        expect(records.out_of_range?).to be(false)
-      end
-    end
-  end
-
-  context 'when an invalid page is specified' do
-
-    let(:records) do
-      ArticleForPagination.search('title:test').page(6).records
-    end
-
-    describe '#size' do
-
-      it 'returns the correct size' do
-        expect(records.size).to eq(0)
-      end
-    end
-
-    describe '#current_page' do
-
-      it 'returns the correct current page' do
-        expect(records.current_page).to eq(6)
-      end
-    end
-
-    describe '#next_page' do
-
-      it 'returns the correct next page' do
-        expect(records.next_page).to be_nil
-      end
-    end
-
-    describe '#total_pages' do
-
-      it 'returns the correct total pages' do
-        expect(records.total_pages).to eq(3)
-      end
-    end
-
-    describe '#first_page?' do
-
-      it 'returns the correct first page' do
-        expect(records.first_page?).to be(false)
-      end
-    end
-
-    describe '#last_page?' do
-
-      it 'returns whether it is the last page', if: !(Kaminari::VERSION < '1') do
-        expect(records.last_page?).to be(false)
-      end
-
-      it 'returns whether it is the last page', if: Kaminari::VERSION < '1' do
-        expect(records.last_page?).to be(true) # Kaminari returns current_page >= total_pages in version < 1.0
-      end
-    end
-
-    describe '#out_of_range?' do
-
-      it 'returns whether the pagination is out of range' do
-        expect(records.out_of_range?).to be(true)
-      end
-    end
-  end
-
-  context 'when a scope is also specified' do
-
-    let(:records) do
-      ArticleForPagination.search('title:test').page(2).records.published
-    end
-
-    describe '#size' do
-
-      it 'returns the correct size' do
-        expect(records.size).to eq(12)
-      end
-    end
-  end
-
-  context 'when a sorting is specified' do
-
-    let(:search) do
-      ArticleForPagination.search({ query: { match: { title: 'test' } }, sort: [ { id: 'desc' } ] })
-    end
-
-    it 'applies the sort' do
-      expect(search.page(2).records.first.id).to eq(43)
-      expect(search.page(3).records.first.id).to eq(18)
-      expect(search.page(2).per(5).records.first.id).to eq(63)
-    end
-  end
-
-  context 'when the model has a specific default per page set' do
-
-    around do |example|
-      original_default = ArticleForPagination.instance_variable_get(:@_default_per_page)
-      ArticleForPagination.paginates_per 50
-      example.run
-      ArticleForPagination.paginates_per original_default
-    end
-
-    it 'uses the default per page setting' do
-      expect(ArticleForPagination.search('*').page(1).records.size).to eq(50)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb
deleted file mode 100644
index 647cb6ddeb..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Parent-Child' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(version: 1) do
-      create_table :questions do |t|
-        t.string     :title
-        t.text       :text
-        t.string     :author
-        t.timestamps null: false
-      end
-
-      create_table :answers do |t|
-        t.text       :text
-        t.string     :author
-        t.references :question
-        t.timestamps null: false
-      end
-
-      add_index(:answers, :question_id) unless index_exists?(:answers, :question_id)
-
-      clear_tables(Question)
-      ParentChildSearchable.create_index!(force: true)
-
-      q_1 = Question.create!(title: 'First Question',  author: 'John')
-      q_2 = Question.create!(title: 'Second Question', author: 'Jody')
-
-      q_1.answers.create!(text: 'Lorem Ipsum', author: 'Adam')
-      q_1.answers.create!(text: 'Dolor Sit',   author: 'Ryan')
-
-      q_2.answers.create!(text: 'Amet Et', author: 'John')
-
-      Question.__elasticsearch__.refresh_index!
-    end
-  end
-
-  describe 'has_child search' do
-
-    let(:search_result) do
-      Question.search(query: { has_child: { type: 'answer', query: { match: { author: 'john' } } } })
-    end
-
-    it 'finds parents by matching on child search criteria' do
-      expect(search_result.records.first.title).to eq('Second Question')
-    end
-  end
-
-  describe 'hash_parent search' do
-
-    let(:search_result) do
-      Answer.search(query: { has_parent: { parent_type: 'question', query: { match: { author: 'john' } } } })
-    end
-
-    it 'finds children by matching in parent criteria' do
-      expect(search_result.records.map(&:author)).to match(['Adam', 'Ryan'])
-    end
-  end
-
-  context 'when a parent is deleted' do
-
-    before do
-      Question.where(title: 'First Question').each(&:destroy)
-      Question.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      Answer.search(query: { has_parent: { parent_type: 'question', query: { match_all: {} } } })
-    end
-
-    it 'deletes the children' do
-      expect(search_result.results.total).to eq(1)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/serialization_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/serialization_spec.rb
deleted file mode 100644
index e5b2072bea..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record/serialization_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table ArticleWithCustomSerialization.table_name do |t|
-        t.string   :title
-        t.string   :status
-      end
-    end
-
-    ArticleWithCustomSerialization.delete_all
-    ArticleWithCustomSerialization.__elasticsearch__.create_index!(force: true)
-  end
-
-  context 'when the model has a custom serialization defined' do
-
-    before do
-      ArticleWithCustomSerialization.create!(title: 'Test', status: 'green')
-      ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
-    end
-
-    context 'when a document is indexed' do
-
-      let(:search_result) do
-        ArticleWithCustomSerialization.__elasticsearch__.client.get(index: 'article_with_custom_serializations',
-                                                                    type:  '_doc',
-                                                                    id:    '1')
-      end
-
-      it 'applies the serialization when indexing' do
-        expect(search_result['_source']).to eq('title' => 'Test')
-      end
-    end
-
-    context 'when a document is updated' do
-
-      before do
-        article.update_attributes(title: 'UPDATED', status: 'yellow')
-        ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
-      end
-
-      let!(:article) do
-        art = ArticleWithCustomSerialization.create!(title: 'Test', status: 'red')
-        ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
-        art
-      end
-
-      let(:search_result) do
-        ArticleWithCustomSerialization.__elasticsearch__.client.get(index: 'article_with_custom_serializations',
-                                                                    type:  '_doc',
-                                                                    id:    article.id)
-      end
-
-      it 'applies the serialization when updating' do
-        expect(search_result['_source']).to eq('title' => 'UPDATED')
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record_spec.rb
deleted file mode 100644
index 6e0cb7d64d..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/active_record_spec.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::ActiveRecord do
-
-  before(:all) do
-    class DummyClassForActiveRecord; end
-  end
-
-  after(:all) do
-    Elasticsearch::Model::Adapter::Adapter.adapters.delete(DummyClassForActiveRecord)
-    remove_classes(DummyClassForActiveRecord)
-  end
-
-  let(:model) do
-    DummyClassForActiveRecord.new.tap do |m|
-      allow(m).to receive(:response).and_return(double('response', response: response))
-      allow(m).to receive(:ids).and_return(ids)
-    end
-  end
-
-  let(:response) do
-    { 'hits' => {'hits' => [ {'_id' => 2 }, {'_id' => 1 } ]} }
-  end
-
-  let(:ids) do
-    [2, 1]
-  end
-
-  let(:record_1) do
-    double('record').tap do |rec|
-      allow(rec).to receive(:id).and_return(1)
-    end
-  end
-
-  let(:record_2) do
-    double('record').tap do |rec|
-      allow(rec).to receive(:id).and_return(2)
-    end
-  end
-
-  let(:records) do
-    [record_1, record_2].tap do |r|
-      allow(r).to receive(:load).and_return(true)
-      allow(r).to receive(:exec_queries).and_return(true)
-    end
-  end
-
-  describe 'adapter registration' do
-
-    before(:all) do
-      DummyClassForActiveRecord.__send__ :include, Elasticsearch::Model::Adapter::ActiveRecord::Records
-    end
-
-    it 'can register an adapater' do
-      expect(Elasticsearch::Model::Adapter.adapters[Elasticsearch::Model::Adapter::ActiveRecord]).not_to be_nil
-      expect(Elasticsearch::Model::Adapter.adapters[Elasticsearch::Model::Adapter::ActiveRecord].call(DummyClassForActiveRecord)).to be(false)
-    end
-  end
-
-  describe '#records' do
-
-    before(:all) do
-      DummyClassForActiveRecord.__send__ :include, Elasticsearch::Model::Adapter::ActiveRecord::Records
-    end
-
-    let(:instance) do
-      model.tap do |inst|
-        allow(inst).to receive(:klass).and_return(double('class', primary_key: :some_key, where: records)).at_least(:once)
-        allow(inst).to receive(:order).and_return(double('class', primary_key: :some_key, where: records)).at_least(:once)
-      end
-    end
-
-    it 'returns the list of records' do
-      expect(instance.records).to eq(records)
-    end
-
-    it 'loads the records' do
-      expect(instance.load).to eq(true)
-    end
-
-    context 'when :includes is specified' do
-
-      before do
-        expect(records).to receive(:includes).with([:submodel]).once.and_return(records)
-        instance.options[:includes] = [:submodel]
-      end
-
-      it 'incorporates the includes option in the query' do
-        expect(instance.records).to eq(records)
-      end
-    end
-  end
-
-  describe 'callbacks registration' do
-
-    before do
-      expect(DummyClassForActiveRecord).to receive(:after_commit).exactly(3).times
-    end
-
-    it 'should register the model class for callbacks' do
-      Elasticsearch::Model::Adapter::ActiveRecord::Callbacks.included(DummyClassForActiveRecord)
-    end
-  end
-
-  describe 'importing' do
-
-    before do
-      DummyClassForActiveRecord.__send__ :extend, Elasticsearch::Model::Adapter::ActiveRecord::Importing
-    end
-
-    context 'when an invalid scope is specified' do
-
-      it 'raises a NoMethodError' do
-        expect {
-          DummyClassForActiveRecord.__find_in_batches(scope: :not_found_method)
-        }.to raise_exception(NoMethodError)
-      end
-    end
-
-    context 'when a valid scope is specified' do
-
-      before do
-        expect(DummyClassForActiveRecord).to receive(:find_in_batches).once.and_return([])
-        expect(DummyClassForActiveRecord).to receive(:published).once.and_return(DummyClassForActiveRecord)
-      end
-
-      it 'uses the scope' do
-        expect(DummyClassForActiveRecord.__find_in_batches(scope: :published)).to eq([])
-      end
-    end
-
-    context 'allow query criteria to be specified' do
-
-      before do
-        expect(DummyClassForActiveRecord).to receive(:find_in_batches).once.and_return([])
-        expect(DummyClassForActiveRecord).to receive(:where).with(color: 'red').once.and_return(DummyClassForActiveRecord)
-      end
-
-      it 'uses the scope' do
-        expect(DummyClassForActiveRecord.__find_in_batches(query: -> { where(color: 'red') })).to eq([])
-      end
-    end
-
-    context 'when preprocessing batches' do
-
-      context 'if the query returns results' do
-
-        before do
-          class << DummyClassForActiveRecord
-            def find_in_batches(options = {}, &block)
-              yield [:a, :b]
-            end
-
-            def update_batch(batch)
-              batch.collect { |b| b.to_s + '!' }
-            end
-          end
-        end
-
-        it 'applies the preprocessing method' do
-          DummyClassForActiveRecord.__find_in_batches(preprocess: :update_batch) do |batch|
-            expect(batch).to match(['a!', 'b!'])
-          end
-        end
-      end
-
-      context 'if the query does not return results' do
-
-        before do
-          class << DummyClassForActiveRecord
-            def find_in_batches(options = {}, &block)
-              yield [:a, :b]
-            end
-
-            def update_batch(batch)
-              []
-            end
-          end
-        end
-
-        it 'applies the preprocessing method' do
-          DummyClassForActiveRecord.__find_in_batches(preprocess: :update_batch) do |batch|
-            expect(batch).to match([])
-          end
-        end
-      end
-    end
-
-    context 'when transforming models' do
-
-      let(:instance) do
-        model.tap do |inst|
-          allow(inst).to receive(:id).and_return(1)
-          allow(inst).to receive(:__elasticsearch__).and_return(double('object', id: 1, as_indexed_json: {}))
-        end
-      end
-
-      it 'returns an proc' do
-        expect(DummyClassForActiveRecord.__transform.respond_to?(:call)).to be(true)
-      end
-
-      it 'provides a default transformation' do
-        expect(DummyClassForActiveRecord.__transform.call(instance)).to eq(index: { _id: 1, data: {} })
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/default_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/default_spec.rb
deleted file mode 100644
index 08064df0fa..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/default_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::Default do
-
-  before(:all) do
-    class DummyClassForDefaultAdapter; end
-    DummyClassForDefaultAdapter.__send__ :include, Elasticsearch::Model::Adapter::Default::Records
-    DummyClassForDefaultAdapter.__send__ :include, Elasticsearch::Model::Adapter::Default::Importing
-  end
-
-  after(:all) do
-    Elasticsearch::Model::Adapter::Adapter.adapters.delete(DummyClassForDefaultAdapter)
-    remove_classes(DummyClassForDefaultAdapter)
-  end
-
-  let(:instance) do
-    DummyClassForDefaultAdapter.new.tap do |m|
-      allow(m).to receive(:klass).and_return(double('class', primary_key: :some_key, find: [1])).at_least(:once)
-    end
-  end
-
-  it 'should have the default records implementation' do
-    expect(instance.records).to eq([1])
-  end
-
-  it 'should have the default Callback implementation' do
-    expect(Elasticsearch::Model::Adapter::Default::Callbacks).to be_a(Module)
-  end
-
-  it 'should have the default Importing implementation' do
-    expect {
-      DummyClassForDefaultAdapter.new.__find_in_batches
-    }.to raise_exception(Elasticsearch::Model::NotImplemented)
-  end
-
-  it 'should have the default transform implementation' do
-    expect {
-      DummyClassForDefaultAdapter.new.__transform
-    }.to raise_exception(Elasticsearch::Model::NotImplemented)
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/basic_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/basic_spec.rb
deleted file mode 100644
index f4aefc7401..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/basic_spec.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::Mongoid, if: test_mongoid? do
-
-  before(:all) do
-    connect_mongoid('mongoid_test')
-    Elasticsearch::Model::Adapter.register \
-              Elasticsearch::Model::Adapter::Mongoid,
-              lambda { |klass| !!defined?(::Mongoid::Document) && klass.respond_to?(:ancestors) && klass.ancestors.include?(::Mongoid::Document) }
-
-    MongoidArticle.__elasticsearch__.create_index! force: true
-
-    MongoidArticle.delete_all
-
-    MongoidArticle.__elasticsearch__.refresh_index!
-    MongoidArticle.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
-  end
-
-  after do
-    clear_indices(MongoidArticle)
-    clear_tables(MongoidArticle)
-  end
-
-  describe 'searching' do
-
-    before do
-      MongoidArticle.create! title: 'Test'
-      MongoidArticle.create! title: 'Testing Coding'
-      MongoidArticle.create! title: 'Coding'
-      MongoidArticle.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      MongoidArticle.search('title:test')
-    end
-
-    it 'find the documents successfully' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-
-    describe '#results' do
-
-      it 'returns a Elasticsearch::Model::Response::Result' do
-        expect(search_result.results.first).to be_a(Elasticsearch::Model::Response::Result)
-      end
-
-      it 'retrieves the document from Elasticsearch' do
-        expect(search_result.results.first.title).to eq('Test')
-      end
-
-      it 'retrieves all results' do
-        expect(search_result.results.collect(&:title)).to match(['Test', 'Testing Coding'])
-      end
-    end
-
-    describe '#records' do
-
-      it 'returns an instance of the model' do
-        expect(search_result.records.first).to be_a(MongoidArticle)
-      end
-
-      it 'retrieves the document from Elasticsearch' do
-        expect(search_result.records.first.title).to eq('Test')
-      end
-
-      it 'iterates over the records' do
-        expect(search_result.records.first.title).to eq('Test')
-      end
-
-      it 'retrieves all records' do
-        expect(search_result.records.collect(&:title)).to match(['Test', 'Testing Coding'])
-      end
-
-      describe '#each_with_hit' do
-
-        it 'yields each hit with the model object' do
-          search_result.records.each_with_hit do |r, h|
-            expect(h._source).not_to be_nil
-            expect(h._source.title).not_to be_nil
-          end
-        end
-
-        it 'preserves the search order' do
-          search_result.records.each_with_hit do |r, h|
-            expect(r.id.to_s).to eq(h._id)
-          end
-        end
-      end
-
-      describe '#map_with_hit' do
-
-        it 'yields each hit with the model object' do
-          search_result.records.map_with_hit do |r, h|
-            expect(h._source).not_to be_nil
-            expect(h._source.title).not_to be_nil
-          end
-        end
-
-        it 'preserves the search order' do
-          search_result.records.map_with_hit do |r, h|
-            expect(r.id.to_s).to eq(h._id)
-          end
-        end
-      end
-    end
-  end
-
-  describe '#destroy' do
-
-    let(:article) do
-      MongoidArticle.create!(title: 'Test')
-    end
-
-    before do
-      article
-      MongoidArticle.create!(title: 'Coding')
-      article.destroy
-      MongoidArticle.__elasticsearch__.refresh_index!
-    end
-
-    it 'removes documents from the index' do
-      expect(MongoidArticle.search('title:test').results.total).to eq(0)
-      expect(MongoidArticle.search('title:code').results.total).to eq(1)
-    end
-  end
-
-  describe 'updates to the document' do
-
-    let(:article) do
-      MongoidArticle.create!(title: 'Test')
-    end
-
-    before do
-      article.title = 'Writing'
-      article.save
-      MongoidArticle.__elasticsearch__.refresh_index!
-    end
-
-    it 'indexes updates' do
-      expect(MongoidArticle.search('title:write').results.total).to eq(1)
-      expect(MongoidArticle.search('title:test').results.total).to eq(0)
-    end
-  end
-
-  describe 'DSL search' do
-
-    before do
-      MongoidArticle.create! title: 'Test'
-      MongoidArticle.create! title: 'Testing Coding'
-      MongoidArticle.create! title: 'Coding'
-      MongoidArticle.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      MongoidArticle.search(query: { match: { title: { query: 'test' } } })
-    end
-
-    it 'finds the matching documents' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-  end
-
-  describe 'paging a collection' do
-
-    before do
-      MongoidArticle.create! title: 'Test'
-      MongoidArticle.create! title: 'Testing Coding'
-      MongoidArticle.create! title: 'Coding'
-      MongoidArticle.__elasticsearch__.refresh_index!
-    end
-
-    let(:search_result) do
-      MongoidArticle.search(query: { match: { title: { query: 'test' } } },
-                            size: 2,
-                            from: 1)
-    end
-
-    it 'applies the size and from parameters' do
-      expect(search_result.results.size).to eq(1)
-      expect(search_result.results.first.title).to eq('Testing Coding')
-      expect(search_result.records.size).to eq(1)
-      expect(search_result.records.first.title).to eq('Testing Coding')
-    end
-  end
-
-  describe 'importing' do
-
-    before do
-      97.times { |i| MongoidArticle.create! title: "Test #{i}" }
-      MongoidArticle.__elasticsearch__.create_index! force: true
-      MongoidArticle.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
-    end
-
-    context 'when there is no default scope' do
-
-      let!(:batch_count) do
-        batches = 0
-        errors  = MongoidArticle.import(batch_size: 10) do |response|
-          batches += 1
-        end
-        MongoidArticle.__elasticsearch__.refresh_index!
-        batches
-      end
-
-      it 'imports all the documents' do
-        expect(MongoidArticle.search('*').results.total).to eq(97)
-      end
-
-      it 'uses the specified batch size' do
-        expect(batch_count).to eq(10)
-      end
-    end
-
-    context 'when there is a default scope' do
-
-      around(:all) do |example|
-        10.times { |i| MongoidArticle.create! title: 'Test', views: "#{i}" }
-        MongoidArticle.default_scope -> { MongoidArticle.gt(views: 3) }
-        example.run
-        MongoidArticle.default_scoping = nil
-      end
-
-      before do
-        MongoidArticle.__elasticsearch__.import
-        MongoidArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'uses the default scope' do
-        expect(MongoidArticle.search('*').results.total).to eq(6)
-      end
-    end
-
-    context 'when there is a default scope and a query specified' do
-
-      around(:all) do |example|
-        10.times { |i| MongoidArticle.create! title: 'Test', views: "#{i}" }
-        MongoidArticle.default_scope -> { MongoidArticle.gt(views: 3) }
-        example.run
-        MongoidArticle.default_scoping = nil
-      end
-
-      before do
-        MongoidArticle.import(query: -> { lte(views: 4) })
-        MongoidArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'combines the query and the default scope' do
-        expect(MongoidArticle.search('*').results.total).to eq(1)
-      end
-    end
-
-    context 'when the batch is empty' do
-
-      before do
-        MongoidArticle.delete_all
-        MongoidArticle.import
-        MongoidArticle.__elasticsearch__.refresh_index!
-      end
-
-      it 'does not make any requests to create documents' do
-        expect(MongoidArticle.search('*').results.total).to eq(0)
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb
deleted file mode 100644
index e4308ab987..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Adapter::ActiveRecord Multimodel', if: test_mongoid? do
-
-  before(:all) do
-    connect_mongoid('mongoid_test')
-
-    begin
-      ActiveRecord::Schema.define(:version => 1) do
-      create_table Episode.table_name do |t|
-        t.string :name
-        t.datetime :created_at, :default => 'NOW()'
-      end
-      end
-    rescue
-    end
-  end
-
-  before do
-    clear_tables(Episode, Image)
-    Episode.__elasticsearch__.create_index! force: true
-    Episode.create name: "TheEpisode"
-    Episode.create name: "A great Episode"
-    Episode.create name: "The greatest Episode"
-    Episode.__elasticsearch__.refresh_index!
-
-    Image.__elasticsearch__.create_index! force: true
-    Image.create! name: "The Image"
-    Image.create! name: "A great Image"
-    Image.create! name: "The greatest Image"
-    Image.__elasticsearch__.refresh_index!
-    Image.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
-  end
-
-  after do
-    [Episode, Image].each do |model|
-      model.__elasticsearch__.client.delete_by_query(index: model.index_name, q: '*')
-      model.delete_all
-      model.__elasticsearch__.refresh_index!
-    end
-  end
-
-  context 'when the search is across multimodels with different adapters' do
-
-    let(:search_result) do
-      Elasticsearch::Model.search(%q<"greatest Episode" OR "greatest Image"^2>, [Episode, Image])
-    end
-
-    it 'executes the search across models' do
-      expect(search_result.results.size).to eq(2)
-      expect(search_result.records.size).to eq(2)
-    end
-
-    it 'returns the correct type of model instance' do
-      expect(search_result.records[0]).to be_a(Image)
-      expect(search_result.records[1]).to be_a(Episode)
-    end
-
-    it 'creates the model instances with the correct attributes' do
-      expect(search_result.results[0].name).to eq('The greatest Image')
-      expect(search_result.records[0].name).to eq('The greatest Image')
-      expect(search_result.results[1].name).to eq('The greatest Episode')
-      expect(search_result.records[1].name).to eq('The greatest Episode')
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid_spec.rb
deleted file mode 100644
index 3a01a66351..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/mongoid_spec.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::Mongoid do
-
-  before(:all) do
-    class DummyClassForMongoid; end
-    ::Symbol.class_eval { def in; self; end }
-  end
-
-  after(:all) do
-    Elasticsearch::Model::Adapter::Adapter.adapters.delete(DummyClassForMongoid)
-    remove_classes(DummyClassForMongoid)
-  end
-
-  let(:response) do
-    { 'hits' => {'hits' => [ {'_id' => 2}, {'_id' => 1} ]} }
-  end
-
-  let(:ids) do
-    [2, 1]
-  end
-
-  let(:record_1) do
-    double('record').tap do |rec|
-      allow(rec).to receive(:id).and_return(1)
-    end
-  end
-
-  let(:record_2) do
-    double('record').tap do |rec|
-      allow(rec).to receive(:load).and_return(true)
-      allow(rec).to receive(:id).and_return(2)
-    end
-  end
-
-  let(:records) do
-    [record_1, record_2]
-  end
-
-  let(:model) do
-    DummyClassForMongoid.new.tap do |m|
-      allow(m).to receive(:response).and_return(double('response', response: response))
-      allow(m).to receive(:ids).and_return(ids)
-    end
-  end
-
-  describe 'adapter registration' do
-
-    it 'registers an adapater' do
-      expect(Elasticsearch::Model::Adapter.adapters[Elasticsearch::Model::Adapter::Mongoid]).not_to be_nil
-      expect(Elasticsearch::Model::Adapter.adapters[Elasticsearch::Model::Adapter::Mongoid].call(DummyClassForMongoid)).to be(false)
-    end
-
-    it 'registers the records module' do
-      expect(Elasticsearch::Model::Adapter::Mongoid::Records).to be_a(Module)
-    end
-  end
-
-  describe '#records' do
-
-    before(:all) do
-      DummyClassForMongoid.__send__ :include, Elasticsearch::Model::Adapter::Mongoid::Records
-    end
-
-    let(:instance) do
-      model.tap do |inst|
-        allow(inst).to receive(:klass).and_return(double('class', where: records)).at_least(:once)
-      end
-    end
-
-    it 'returns the records' do
-      expect(instance.records).to eq(records)
-    end
-
-    context 'when an order is not defined for the Mongoid query' do
-
-      context 'when the records have a different order than the hits' do
-
-        before do
-          records.instance_variable_set(:@records, records)
-        end
-
-        it 'reorders the records based on hits order' do
-          expect(records.collect(&:id)).to eq([1, 2])
-          expect(instance.records.to_a.collect(&:id)).to eq([2, 1])
-        end
-      end
-
-      context 'when an order is defined for the Mongoid query' do
-
-        context 'when the records have a different order than the hits' do
-
-          before do
-            records.instance_variable_set(:@records, records)
-            expect(instance.records).to receive(:asc).and_return(records)
-          end
-
-          it 'reorders the records based on hits order' do
-            expect(records.collect(&:id)).to eq([1, 2])
-            expect(instance.records.to_a.collect(&:id)).to eq([2, 1])
-            expect(instance.asc.to_a.collect(&:id)).to eq([1, 2])
-          end
-        end
-      end
-    end
-
-    describe 'callbacks registration' do
-
-      before do
-        expect(DummyClassForMongoid).to receive(:after_create).once
-        expect(DummyClassForMongoid).to receive(:after_update).once
-        expect(DummyClassForMongoid).to receive(:after_destroy).once
-      end
-
-      it 'should register the model class for callbacks' do
-        Elasticsearch::Model::Adapter::Mongoid::Callbacks.included(DummyClassForMongoid)
-      end
-    end
-  end
-
-  describe 'importing' do
-
-    before(:all) do
-      DummyClassForMongoid.__send__ :extend, Elasticsearch::Model::Adapter::Mongoid::Importing
-    end
-
-    let(:relation) do
-      double('relation', each_slice: []).tap do |rel|
-        allow(rel).to receive(:published).and_return(rel)
-        allow(rel).to receive(:no_timeout).and_return(rel)
-        allow(rel).to receive(:class_exec).and_return(rel)
-      end
-    end
-
-    before do
-      allow(DummyClassForMongoid).to receive(:all).and_return(relation)
-    end
-
-    context 'when a scope is specified' do
-
-      it 'applies the scope' do
-        expect(DummyClassForMongoid.__find_in_batches(scope: :published) do; end).to eq([])
-      end
-    end
-
-    context 'query criteria specified as a proc' do
-
-      let(:query) do
-        Proc.new { where(color: "red") }
-      end
-
-      it 'execites the query' do
-        expect(DummyClassForMongoid.__find_in_batches(query: query) do; end).to eq([])
-      end
-    end
-
-    context 'query criteria specified as a hash' do
-
-      before do
-        expect(relation).to receive(:where).with(color: 'red').and_return(relation)
-      end
-
-      let(:query) do
-        { color: "red" }
-      end
-
-      it 'execites the query' do
-        expect(DummyClassForMongoid.__find_in_batches(query: query) do; end).to eq([])
-      end
-    end
-
-    context 'when preprocessing batches' do
-
-      context 'if the query returns results' do
-
-        before do
-          class << DummyClassForMongoid
-            def find_in_batches(options = {}, &block)
-              yield [:a, :b]
-            end
-
-            def update_batch(batch)
-              batch.collect { |b| b.to_s + '!' }
-            end
-          end
-        end
-
-        it 'applies the preprocessing method' do
-          DummyClassForMongoid.__find_in_batches(preprocess: :update_batch) do |batch|
-            expect(batch).to match(['a!', 'b!'])
-          end
-        end
-      end
-
-      context 'if the query does not return results' do
-
-        before do
-          class << DummyClassForMongoid
-            def find_in_batches(options = {}, &block)
-              yield [:a, :b]
-            end
-
-            def update_batch(batch)
-              []
-            end
-          end
-        end
-
-        it 'applies the preprocessing method' do
-          DummyClassForMongoid.__find_in_batches(preprocess: :update_batch) do |batch|
-            expect(batch).to match([])
-          end
-        end
-      end
-    end
-
-    context 'when transforming models' do
-
-      let(:instance) do
-        model.tap do |inst|
-          allow(inst).to receive(:as_indexed_json).and_return({})
-          allow(inst).to receive(:id).and_return(1)
-        end
-      end
-
-      it 'returns an proc' do
-        expect(DummyClassForMongoid.__transform.respond_to?(:call)).to be(true)
-      end
-
-      it 'provides a default transformation' do
-        expect(DummyClassForMongoid.__transform.call(instance)).to eq(index: { _id: '1', data: {} })
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/multiple_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/multiple_spec.rb
deleted file mode 100644
index 947df1717c..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/adapters/multiple_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Adapter::Multiple do
-
-  before(:all) do
-    class DummyOne
-      include Elasticsearch::Model
-
-      index_name 'dummy'
-      document_type 'dummy_one'
-
-      def self.find(ids)
-        ids.map { |id| new(id) }
-      end
-
-      attr_reader :id
-
-      def initialize(id)
-        @id = id.to_i
-      end
-    end
-
-    module Namespace
-      class DummyTwo
-        include Elasticsearch::Model
-
-        index_name 'dummy'
-        document_type 'dummy_two'
-
-        def self.find(ids)
-          ids.map { |id| new(id) }
-        end
-
-        attr_reader :id
-
-        def initialize(id)
-          @id = id.to_i
-        end
-      end
-    end
-
-    class DummyTwo
-      include Elasticsearch::Model
-
-      index_name 'other_index'
-      document_type 'dummy_two'
-
-      def self.find(ids)
-        ids.map { |id| new(id) }
-      end
-
-      attr_reader :id
-
-      def initialize(id)
-        @id = id.to_i
-      end
-    end
-  end
-
-  after(:all) do
-    [DummyOne, Namespace::DummyTwo, DummyTwo].each do |adapter|
-      Elasticsearch::Model::Adapter::Adapter.adapters.delete(adapter)
-    end
-    Namespace.send(:remove_const, :DummyTwo) if defined?(Namespace::DummyTwo)
-    remove_classes(DummyOne, DummyTwo, Namespace)
-  end
-
-  let(:hits) do
-    [
-      {
-        _index: 'dummy',
-        _type: 'dummy_two',
-        _id: '2'
-      },
-      {
-        _index: 'dummy',
-        _type: 'dummy_one',
-        _id: '2'
-      },
-      {
-        _index: 'other_index',
-        _type: 'dummy_two',
-        _id: '1'
-      },
-      {
-        _index: 'dummy',
-        _type: 'dummy_two',
-        _id: '1'
-      },
-      {
-        _index: 'dummy',
-        _type: 'dummy_one',
-        _id: '3'
-      }
-    ]
-  end
-
-  let(:response) do
-    double('response', response: { 'hits' => { 'hits' => hits } })
-  end
-
-  let(:multimodel) do
-    Elasticsearch::Model::Multimodel.new(DummyOne, DummyTwo, Namespace::DummyTwo)
-  end
-
-  describe '#records' do
-
-    before do
-      multimodel.class.send :include, Elasticsearch::Model::Adapter::Multiple::Records
-      expect(multimodel).to receive(:response).at_least(:once).and_return(response)
-    end
-
-    it 'instantiates the correct types of instances' do
-      expect(multimodel.records[0]).to be_a(Namespace::DummyTwo)
-      expect(multimodel.records[1]).to be_a(DummyOne)
-      expect(multimodel.records[2]).to be_a(DummyTwo)
-      expect(multimodel.records[3]).to be_a(Namespace::DummyTwo)
-      expect(multimodel.records[4]).to be_a(DummyOne)
-    end
-
-    it 'returns the results in the correct order' do
-      expect(multimodel.records.map(&:id)).to eq([2, 2, 1, 1, 3])
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/callbacks_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/callbacks_spec.rb
deleted file mode 100644
index d10ce656c0..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/callbacks_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Callbacks do
-
-  before(:all) do
-    class ::DummyCallbacksModel
-    end
-
-    module DummyCallbacksAdapter
-      module CallbacksMixin
-      end
-
-      def callbacks_mixin
-        CallbacksMixin
-      end; module_function :callbacks_mixin
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyCallbacksModel, DummyCallbacksAdapter)
-  end
-
-  context 'when a model includes the Callbacks module' do
-
-    before do
-      Elasticsearch::Model::Callbacks.included(DummyCallbacksModel)
-    end
-
-    it 'includes the callbacks mixin from the model adapter' do
-      expect(DummyCallbacksModel.ancestors).to include(Elasticsearch::Model::Adapter::Default::Callbacks)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/client_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/client_spec.rb
deleted file mode 100644
index ea273af732..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/client_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Client do
-
-  before(:all) do
-    class ::DummyClientModel
-      extend  Elasticsearch::Model::Client::ClassMethods
-      include Elasticsearch::Model::Client::InstanceMethods
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyClientModel)
-  end
-
-  context 'when a class includes the client module class methods' do
-
-    it 'defines the client module class methods on the model' do
-      expect(DummyClientModel.client).to be_a(Elasticsearch::Transport::Client)
-    end
-  end
-
-  context 'when a class includes the client module instance methods' do
-
-    it 'defines the client module class methods on the model' do
-      expect(DummyClientModel.new.client).to be_a(Elasticsearch::Transport::Client)
-    end
-  end
-
-  context 'when the client is set on the class' do
-
-    around do |example|
-      original_client = DummyClientModel.client
-      DummyClientModel.client = 'foobar'
-      example.run
-      DummyClientModel.client = original_client
-    end
-
-    it 'sets the client on the class' do
-      expect(DummyClientModel.client).to eq('foobar')
-    end
-
-    it 'sets the client on an instance' do
-      expect(DummyClientModel.new.client).to eq('foobar')
-    end
-  end
-
-  context 'when the client is set on an instance' do
-
-    before do
-      model_instance.client = 'foo'
-    end
-
-    let(:model_instance) do
-      DummyClientModel.new
-    end
-
-    it 'sets the client on an instance' do
-      expect(model_instance.client).to eq('foo')
-    end
-
-    it 'does not set the client on the class' do
-      expect(DummyClientModel.client).to be_a(Elasticsearch::Transport::Client)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/hash_wrapper_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/hash_wrapper_spec.rb
deleted file mode 100644
index 53f018726f..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/hash_wrapper_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::HashWrapper, if: Hashie::VERSION >= '3.5.3' do
-
-  before do
-    expect(Hashie.logger).to receive(:warn).never
-  end
-
-  it 'does not print a warning for re-defined methods' do
-    Elasticsearch::Model::HashWrapper.new(:foo => 'bar', :sort => true)
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/importing_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/importing_spec.rb
deleted file mode 100644
index c46f00ba64..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/importing_spec.rb
+++ /dev/null
@@ -1,214 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Importing do
-
-  before(:all) do
-    class DummyImportingModel
-    end
-
-    module DummyImportingAdapter
-      module ImportingMixin
-        def __find_in_batches(options={}, &block)
-          yield if block_given?
-        end
-        def __transform
-          lambda {|a|}
-        end
-      end
-
-      def importing_mixin
-        ImportingMixin
-      end; module_function :importing_mixin
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyImportingModel, DummyImportingAdapter)
-  end
-
-  before do
-    allow(Elasticsearch::Model::Adapter).to receive(:from_class).with(DummyImportingModel).and_return(DummyImportingAdapter)
-    DummyImportingModel.__send__ :include, Elasticsearch::Model::Importing
-  end
-
-  context 'when a model includes the Importing module' do
-
-    it 'provides importing methods' do
-      expect(DummyImportingModel.respond_to?(:import)).to be(true)
-      expect(DummyImportingModel.respond_to?(:__find_in_batches)).to be(true)
-    end
-  end
-
-  describe '#import' do
-
-    before do
-      allow(DummyImportingModel).to receive(:index_name).and_return('foo')
-      allow(DummyImportingModel).to receive(:document_type).and_return('foo')
-      allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
-      allow(DummyImportingModel).to receive(:__batch_to_bulk)
-      allow(client).to receive(:bulk).and_return(response)
-    end
-
-    let(:client) do
-      double('client')
-    end
-
-    let(:response) do
-      { 'items' => [] }
-    end
-
-    context 'when no options are provided' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
-      end
-
-      it 'uses the client to import documents' do
-        expect(DummyImportingModel.import).to eq(0)
-      end
-    end
-
-    context 'when there is an error' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
-      end
-
-      let(:response) do
-        { 'items' => [{ 'index' => { } }, { 'index' => { 'error' => 'FAILED' } }] }
-      end
-
-      it 'returns the number of errors' do
-        expect(DummyImportingModel.import).to eq(1)
-      end
-
-      context 'when the method is called with the option to return the errors' do
-
-        it 'returns the errors' do
-          expect(DummyImportingModel.import(return: 'errors')).to eq([{ 'index' => { 'error' => 'FAILED' } }])
-        end
-      end
-
-      context 'when the method is called with a block' do
-
-        it 'yields the response to the block' do
-          DummyImportingModel.import do |response|
-            expect(response['items'].size).to eq(2)
-          end
-        end
-      end
-    end
-
-    context 'when the index does not exist' do
-
-      before do
-        allow(DummyImportingModel).to receive(:index_exists?).and_return(false)
-      end
-
-      it 'raises an exception' do
-        expect {
-          DummyImportingModel.import
-        }.to raise_exception(ArgumentError)
-      end
-    end
-
-    context 'when the method is called with the force option' do
-
-      before do
-        expect(DummyImportingModel).to receive(:create_index!).with(force: true, index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
-      end
-
-      it 'deletes and creates the index' do
-        expect(DummyImportingModel.import(force: true, foo: 'bar')).to eq(0)
-      end
-    end
-
-    context 'when the method is called with the refresh option' do
-
-      before do
-        expect(DummyImportingModel).to receive(:refresh_index!).with(index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
-      end
-
-      it 'refreshes the index' do
-        expect(DummyImportingModel.import(refresh: true, foo: 'bar')).to eq(0)
-      end
-    end
-
-    context 'when a different index name is provided' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index', type: 'foo').and_return(response)
-      end
-
-      it 'uses the alternate index name' do
-        expect(DummyImportingModel.import(index: 'my-new-index')).to eq(0)
-      end
-    end
-
-    context 'when a different document type is provided' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'my-new-type').and_return(response)
-      end
-
-      it 'uses the alternate index name' do
-        expect(DummyImportingModel.import(type: 'my-new-type')).to eq(0)
-      end
-    end
-
-    context 'the transform method' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(DummyImportingModel).to receive(:__transform).and_return(transform)
-        expect(DummyImportingModel).to receive(:__batch_to_bulk).with(anything, transform)
-      end
-
-      let(:transform) do
-        lambda {|a|}
-      end
-
-      it 'applies the transform method to the results' do
-        expect(DummyImportingModel.import).to eq(0)
-      end
-    end
-
-    context 'when a transform is provided as an option' do
-
-      context 'when the transform option is not a lambda' do
-
-        let(:transform) do
-          'not_callable'
-        end
-
-        it 'raises an error' do
-          expect {
-            DummyImportingModel.import(transform: transform)
-          }.to raise_exception(ArgumentError)
-        end
-      end
-
-      context 'when the transform option is a lambda' do
-
-        before do
-          expect(DummyImportingModel).to receive(:client).and_return(client)
-          expect(DummyImportingModel).to receive(:__batch_to_bulk).with(anything, transform)
-        end
-
-        let(:transform) do
-          lambda {|a|}
-        end
-
-        it 'applies the transform lambda to the results' do
-          expect(DummyImportingModel.import(transform: transform)).to eq(0)
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb
deleted file mode 100644
index 54656d4df4..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb
+++ /dev/null
@@ -1,918 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Indexing do
-
-  before(:all) do
-    class ::DummyIndexingModel
-      extend ActiveModel::Naming
-      extend Elasticsearch::Model::Naming::ClassMethods
-      extend Elasticsearch::Model::Indexing::ClassMethods
-
-      def self.foo
-        'bar'
-      end
-    end
-
-    class NotFound < Exception; end
-  end
-
-  after(:all) do
-    remove_classes(DummyIndexingModel, NotFound)
-  end
-
-  describe 'the Settings class' do
-
-    it 'should be convertible to a hash' do
-      expect(Elasticsearch::Model::Indexing::Settings.new(foo: 'bar').to_hash).to eq(foo: 'bar')
-    end
-
-    it 'should be convertible to json' do
-      expect(Elasticsearch::Model::Indexing::Settings.new(foo: 'bar').as_json).to eq(foo: 'bar')
-    end
-  end
-
-  describe '#settings' do
-
-    it 'returns an instance of the Settings class' do
-      expect(DummyIndexingModel.settings).to be_a(Elasticsearch::Model::Indexing::Settings)
-    end
-
-    context 'when the settings are updated' do
-
-      before do
-        DummyIndexingModel.settings(foo: 'boo')
-        DummyIndexingModel.settings(bar: 'bam')
-      end
-
-      it 'updates the settings on the class' do
-        expect(DummyIndexingModel.settings.to_hash).to eq(foo: 'boo', bar: 'bam')
-      end
-    end
-
-    context 'when the settings are updated with a yml file' do
-
-      before do
-        DummyIndexingModel.settings File.open('spec/support/model.yml')
-        DummyIndexingModel.settings bar: 'bam'
-      end
-
-      it 'updates the settings on the class' do
-        expect(DummyIndexingModel.settings.to_hash).to eq(foo: 'boo', bar: 'bam', 'baz' => 'qux')
-      end
-    end
-
-    context 'when the settings are updated with a json file' do
-
-      before do
-        DummyIndexingModel.settings File.open('spec/support/model.json')
-        DummyIndexingModel.settings bar: 'bam'
-      end
-
-      it 'updates the settings on the class' do
-        expect(DummyIndexingModel.settings.to_hash).to eq(foo: 'boo', bar: 'bam', 'baz' => 'qux', 'laz' => 'qux')
-      end
-    end
-  end
-
-  describe '#mappings' do
-
-    let(:expected_mapping_hash) do
-      { :mytype => { foo: 'bar', :properties => {} } }
-    end
-
-    it 'returns an instance of the Mappings class' do
-      expect(DummyIndexingModel.mappings).to be_a(Elasticsearch::Model::Indexing::Mappings)
-    end
-
-    it 'raises an exception when there is no type passed to the #initialize method' do
-      expect {
-        Elasticsearch::Model::Indexing::Mappings.new
-      }.to raise_exception(ArgumentError)
-    end
-
-    it 'should be convertible to a hash' do
-      expect(Elasticsearch::Model::Indexing::Mappings.new(:mytype, { foo: 'bar' }).to_hash).to eq(expected_mapping_hash)
-    end
-
-    it 'should be convertible to json' do
-      expect(Elasticsearch::Model::Indexing::Mappings.new(:mytype, { foo: 'bar' }).as_json).to eq(expected_mapping_hash)
-    end
-
-    context 'when specific mappings are defined' do
-
-      let(:mappings) do
-        Elasticsearch::Model::Indexing::Mappings.new(:mytype)
-      end
-
-      before do
-        mappings.indexes :foo, { type: 'boolean', include_in_all: false }
-        mappings.indexes :bar
-      end
-
-      it 'creates the correct mapping definition' do
-        expect(mappings.to_hash[:mytype][:properties][:foo][:type]).to eq('boolean')
-      end
-
-      it 'uses text as the default type' do
-        expect(mappings.to_hash[:mytype][:properties][:bar][:type]).to eq('text')
-      end
-
-      context 'when mappings are defined for multiple fields' do
-
-        before do
-          mappings.indexes :my_field, type: 'text' do
-            indexes :raw, type: 'keyword'
-          end
-        end
-
-        it 'defines the mapping for all the fields' do
-          expect(mappings.to_hash[:mytype][:properties][:my_field][:type]).to eq('text')
-          expect(mappings.to_hash[:mytype][:properties][:my_field][:fields][:raw][:type]).to eq('keyword')
-          expect(mappings.to_hash[:mytype][:properties][:my_field][:fields][:raw][:properties]).to be_nil
-        end
-      end
-
-      context 'when embedded properties are defined' do
-
-        before do
-          mappings.indexes :foo do
-            indexes :bar
-          end
-
-          mappings.indexes :foo_object, type: 'object' do
-            indexes :bar
-          end
-
-          mappings.indexes :foo_nested, type: 'nested' do
-            indexes :bar
-          end
-
-          mappings.indexes :foo_nested_as_symbol, type: :nested do
-            indexes :bar
-          end
-        end
-
-        it 'defines mappings for the embedded properties' do
-          expect(mappings.to_hash[:mytype][:properties][:foo][:type]).to eq('object')
-          expect(mappings.to_hash[:mytype][:properties][:foo][:properties][:bar][:type]).to eq('text')
-          expect(mappings.to_hash[:mytype][:properties][:foo][:fields]).to be_nil
-
-          expect(mappings.to_hash[:mytype][:properties][:foo_object][:type]).to eq('object')
-          expect(mappings.to_hash[:mytype][:properties][:foo_object][:properties][:bar][:type]).to eq('text')
-          expect(mappings.to_hash[:mytype][:properties][:foo_object][:fields]).to be_nil
-
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested][:type]).to eq('nested')
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested][:properties][:bar][:type]).to eq('text')
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested][:fields]).to be_nil
-
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested_as_symbol][:type]).to eq(:nested)
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested_as_symbol][:properties]).not_to be_nil
-          expect(mappings.to_hash[:mytype][:properties][:foo_nested_as_symbol][:fields]).to be_nil
-        end
-      end
-    end
-
-    context 'when the method is called on a class' do
-
-      before do
-        DummyIndexingModel.mappings(foo: 'boo')
-        DummyIndexingModel.mappings(bar: 'bam')
-      end
-
-      let(:expected_mappings_hash) do
-        { _doc: { foo: "boo", bar: "bam", properties: {} } }
-      end
-
-      it 'sets the mappings' do
-        expect(DummyIndexingModel.mappings.to_hash).to eq(expected_mappings_hash)
-      end
-
-      context 'when the method is called with a block' do
-
-        before do
-          DummyIndexingModel.mapping do
-            indexes :foo, type: 'boolean'
-          end
-        end
-
-        it 'sets the mappings' do
-          expect(DummyIndexingModel.mapping.to_hash[:_doc][:properties][:foo][:type]).to eq('boolean')
-        end
-      end
-    end
-  end
-
-  describe 'instance methods' do
-
-    before(:all) do
-      class ::DummyIndexingModelWithCallbacks
-        extend  Elasticsearch::Model::Indexing::ClassMethods
-        include Elasticsearch::Model::Indexing::InstanceMethods
-
-        def self.before_save(&block)
-          (@callbacks ||= {})[block.hash] = block
-        end
-
-        def changes_to_save
-          {:foo => ['One', 'Two']}
-        end
-      end
-
-      class ::DummyIndexingModelWithNoChanges
-        extend  Elasticsearch::Model::Indexing::ClassMethods
-        include Elasticsearch::Model::Indexing::InstanceMethods
-
-        def self.before_save(&block)
-          (@callbacks ||= {})[block.hash] = block
-        end
-
-        def changes_to_save
-          {}
-        end
-      end
-
-      class ::DummyIndexingModelWithCallbacksAndCustomAsIndexedJson
-        extend  Elasticsearch::Model::Indexing::ClassMethods
-        include Elasticsearch::Model::Indexing::InstanceMethods
-
-        def self.before_save(&block)
-          (@callbacks ||= {})[block.hash] = block
-        end
-
-        def changes_to_save
-          {:foo => ['A', 'B'], :bar => ['C', 'D']}
-        end
-
-        def as_indexed_json(options={})
-          { :foo => 'B' }
-        end
-      end
-
-      class ::DummyIndexingModelWithOldDirty
-        extend  Elasticsearch::Model::Indexing::ClassMethods
-        include Elasticsearch::Model::Indexing::InstanceMethods
-
-        def self.before_save(&block)
-          (@callbacks ||= {})[block.hash] = block
-        end
-
-        def changes
-          {:foo => ['One', 'Two']}
-        end
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :DummyIndexingModelWithCallbacks) if defined?(DummyIndexingModelWithCallbacks)
-      Object.send(:remove_const, :DummyIndexingModelWithNoChanges) if defined?(DummyIndexingModelWithNoChanges)
-      Object.send(:remove_const, :DummyIndexingModelWithCallbacksAndCustomAsIndexedJson) if defined?(DummyIndexingModelWithCallbacksAndCustomAsIndexedJson)
-      Object.send(:remove_const, :DummyIndexingModelWithOldDirty) if defined?(DummyIndexingModelWithOldDirty)
-    end
-
-    context 'when the module is included' do
-
-      context 'when the model uses the old ActiveModel::Dirty' do
-
-        before do
-          DummyIndexingModelWithOldDirty.__send__ :include, Elasticsearch::Model::Indexing::InstanceMethods
-        end
-
-        it 'registers callbacks' do
-          expect(DummyIndexingModelWithOldDirty.instance_variable_get(:@callbacks)).not_to be_empty
-        end
-
-        let(:instance) do
-          DummyIndexingModelWithOldDirty.new
-        end
-
-        it 'sets the @__changed_model_attributes variable before the callback' do
-          DummyIndexingModelWithOldDirty.instance_variable_get(:@callbacks).each do |n, callback|
-            instance.instance_eval(&callback)
-            expect(instance.instance_variable_get(:@__changed_model_attributes)).to eq(foo: 'Two')
-          end
-        end
-      end
-
-      context 'when the model users the current ActiveModel::Dirty' do
-
-        before do
-          DummyIndexingModelWithCallbacks.__send__ :include, Elasticsearch::Model::Indexing::InstanceMethods
-        end
-
-        it 'registers callbacks' do
-          expect(DummyIndexingModelWithCallbacks.instance_variable_get(:@callbacks)).not_to be_empty
-        end
-
-        let(:instance) do
-          DummyIndexingModelWithCallbacks.new
-        end
-
-        it 'sets the @__changed_model_attributes variable before the callback' do
-          DummyIndexingModelWithCallbacks.instance_variable_get(:@callbacks).each do |n, callback|
-            instance.instance_eval(&callback)
-            expect(instance.instance_variable_get(:@__changed_model_attributes)).to eq(foo: 'Two')
-          end
-        end
-      end
-    end
-
-    describe '#index_document' do
-
-      before do
-        expect(instance).to receive(:client).and_return(client)
-        expect(instance).to receive(:as_indexed_json).and_return('JSON')
-        expect(instance).to receive(:index_name).and_return('foo')
-        expect(instance).to receive(:document_type).and_return('bar')
-        expect(instance).to receive(:id).and_return('1')
-      end
-
-      let(:client) do
-        double('client')
-      end
-
-      let(:instance) do
-        DummyIndexingModelWithCallbacks.new
-      end
-
-      context 'when no options are passed to the method' do
-
-        before do
-          expect(client).to receive(:index).with(index: 'foo', type: 'bar', id: '1', body: 'JSON').and_return(true)
-        end
-
-        it 'provides the method on an instance' do
-          expect(instance.index_document).to be(true)
-        end
-      end
-
-      context 'when extra options are passed to the method' do
-
-        before do
-          expect(client).to receive(:index).with(index: 'foo', type: 'bar', id: '1', body: 'JSON', parent: 'A').and_return(true)
-        end
-
-        it 'passes the extra options to the method call on the client' do
-          expect(instance.index_document(parent: 'A')).to be(true)
-        end
-      end
-    end
-
-    describe '#delete_document' do
-
-      before do
-        expect(instance).to receive(:client).and_return(client)
-        expect(instance).to receive(:index_name).and_return('foo')
-        expect(instance).to receive(:document_type).and_return('bar')
-        expect(instance).to receive(:id).and_return('1')
-      end
-
-      let(:client) do
-        double('client')
-      end
-
-      let(:instance) do
-        DummyIndexingModelWithCallbacks.new
-      end
-
-      context 'when no options are passed to the method' do
-
-        before do
-          expect(client).to receive(:delete).with(index: 'foo', type: 'bar', id: '1').and_return(true)
-        end
-
-        it 'provides the method on an instance' do
-          expect(instance.delete_document).to be(true)
-        end
-      end
-
-      context 'when extra options are passed to the method' do
-
-        before do
-          expect(client).to receive(:delete).with(index: 'foo', type: 'bar', id: '1', parent: 'A').and_return(true)
-        end
-
-        it 'passes the extra options to the method call on the client' do
-          expect(instance.delete_document(parent: 'A')).to be(true)
-        end
-      end
-    end
-
-    describe '#update_document' do
-
-      let(:client) do
-        double('client')
-      end
-
-      let(:instance) do
-        DummyIndexingModelWithCallbacks.new
-      end
-
-      context 'when no changes are present' do
-
-        before do
-          expect(instance).to receive(:index_document).and_return(true)
-          expect(client).to receive(:update).never
-          instance.instance_variable_set(:@__changed_model_attributes, nil)
-        end
-
-        it 'updates the document' do
-          expect(instance.update_document).to be(true)
-        end
-      end
-
-      context 'when changes are present' do
-
-        before do
-          allow(instance).to receive(:client).and_return(client)
-          allow(instance).to receive(:index_name).and_return('foo')
-          allow(instance).to receive(:document_type).and_return('bar')
-          allow(instance).to receive(:id).and_return('1')
-        end
-
-        context 'when the changes are included in the as_indexed_json representation' do
-
-          before do
-            instance.instance_variable_set(:@__changed_model_attributes, { foo: 'bar' })
-            expect(client).to receive(:update).with(index: 'foo', type: 'bar', id: '1', body: { doc: { foo: 'bar' } }).and_return(true)
-          end
-
-          it 'updates the document' do
-            expect(instance.update_document).to be(true)
-          end
-        end
-
-        context 'when the changes are not all included in the as_indexed_json representation' do
-
-          let(:instance) do
-            DummyIndexingModelWithCallbacksAndCustomAsIndexedJson.new
-          end
-
-          before do
-            instance.instance_variable_set(:@__changed_model_attributes, {'foo' => 'B', 'bar' => 'D' })
-            expect(client).to receive(:update).with(index: 'foo', type: 'bar', id: '1', body: { doc: { foo: 'B' } }).and_return(true)
-          end
-
-          it 'updates the document' do
-            expect(instance.update_document).to be(true)
-          end
-        end
-
-        context 'when none of the changes are included in the as_indexed_json representation' do
-
-          let(:instance) do
-            DummyIndexingModelWithCallbacksAndCustomAsIndexedJson.new
-          end
-
-          before do
-            instance.instance_variable_set(:@__changed_model_attributes, {'bar' => 'D' })
-          end
-
-          it 'does not update the document' do
-            expect(instance.update_document).to_not be(true)
-          end
-        end
-
-        context 'when there are partial updates' do
-
-          let(:instance) do
-            DummyIndexingModelWithCallbacksAndCustomAsIndexedJson.new
-          end
-
-          before do
-            instance.instance_variable_set(:@__changed_model_attributes, { 'foo' => { 'bar' => 'BAR'} })
-            expect(instance).to receive(:as_indexed_json).and_return('foo' => 'BAR')
-            expect(client).to receive(:update).with(index: 'foo', type: 'bar', id: '1', body: { doc: { 'foo' => 'BAR' } }).and_return(true)
-          end
-
-          it 'updates the document' do
-            expect(instance.update_document).to be(true)
-          end
-        end
-      end
-    end
-
-    describe '#update_document_attributes' do
-
-      let(:client) do
-        double('client')
-      end
-
-      let(:instance) do
-        DummyIndexingModelWithCallbacks.new
-      end
-
-      context 'when changes are present' do
-
-        before do
-          expect(instance).to receive(:client).and_return(client)
-          expect(instance).to receive(:index_name).and_return('foo')
-          expect(instance).to receive(:document_type).and_return('bar')
-          expect(instance).to receive(:id).and_return('1')
-          instance.instance_variable_set(:@__changed_model_attributes, { author: 'john' })
-        end
-
-        context 'when no options are specified' do
-
-          before do
-            expect(client).to receive(:update).with(index: 'foo', type: 'bar', id: '1', body: { doc: { title: 'green' } }).and_return(true)
-          end
-
-          it 'updates the document' do
-            expect(instance.update_document_attributes(title: 'green')).to be(true)
-          end
-        end
-
-        context 'when extra options are provided' do
-
-          before do
-            expect(client).to receive(:update).with(index: 'foo', type: 'bar', id: '1', body: { doc: { title: 'green' } }, refresh: true).and_return(true)
-          end
-
-          it 'updates the document' do
-            expect(instance.update_document_attributes({ title: 'green' }, refresh: true)).to be(true)
-          end
-        end
-      end
-    end
-  end
-
-  describe '#index_exists?' do
-
-    before do
-      expect(DummyIndexingModel).to receive(:client).and_return(client)
-    end
-
-    context 'when the index exists' do
-
-      let(:client) do
-        double('client', indices: double('indices', exists: true))
-      end
-
-      it 'returns true' do
-        expect(DummyIndexingModel.index_exists?).to be(true)
-      end
-    end
-
-    context 'when the index does not exists' do
-
-      let(:client) do
-        double('client', indices: double('indices', exists: false))
-      end
-
-      it 'returns false' do
-        expect(DummyIndexingModel.index_exists?).to be(false)
-      end
-    end
-
-    context 'when the index API raises an error' do
-
-      let(:client) do
-        double('client').tap do |cl|
-          expect(cl).to receive(:indices).and_raise(StandardError)
-        end
-      end
-
-      it 'returns false' do
-        expect(DummyIndexingModel.index_exists?).to be(false)
-      end
-    end
-
-    context 'when the indices.exists API raises an error' do
-
-      let(:client) do
-        double('client', indices: indices)
-      end
-
-      let(:indices) do
-        double('indices').tap do |ind|
-          expect(ind).to receive(:exists).and_raise(StandardError)
-        end
-      end
-
-      it 'returns false' do
-        expect(DummyIndexingModel.index_exists?).to be(false)
-      end
-    end
-  end
-
-  describe '#delete_index!' do
-
-    before(:all) do
-      class ::DummyIndexingModelForRecreate
-        extend ActiveModel::Naming
-        extend Elasticsearch::Model::Naming::ClassMethods
-        extend Elasticsearch::Model::Indexing::ClassMethods
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :DummyIndexingModelForRecreate) if defined?(DummyIndexingModelForRecreate)
-    end
-
-    context 'when the index is not found' do
-
-      let(:client) do
-        double('client', indices: indices, transport: double('transport', { logger: nil }))
-      end
-
-      let(:indices) do
-        double('indices').tap do |ind|
-          expect(ind).to receive(:delete).and_raise(NotFound)
-        end
-      end
-
-      before do
-        expect(DummyIndexingModelForRecreate).to receive(:client).at_most(3).times.and_return(client)
-      end
-
-      context 'when the force option is true' do
-
-        it 'deletes the index without raising an exception' do
-          expect(DummyIndexingModelForRecreate.delete_index!(force: true)).to be_nil
-        end
-
-        context 'when the client has a logger' do
-
-          let(:logger) do
-            Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
-          end
-
-          let(:client) do
-            double('client', indices: indices, transport: double('transport', { logger: logger }))
-          end
-
-          it 'deletes the index without raising an exception' do
-            expect(DummyIndexingModelForRecreate.delete_index!(force: true)).to be_nil
-          end
-
-          it 'logs the message that the index is not found' do
-            expect(logger).to receive(:debug)
-            expect(DummyIndexingModelForRecreate.delete_index!(force: true)).to be_nil
-          end
-        end
-      end
-
-      context 'when the force option is not provided' do
-
-        it 'raises an exception' do
-          expect {
-            DummyIndexingModelForRecreate.delete_index!
-          }.to raise_exception(NotFound)
-        end
-      end
-
-      context 'when the exception is not NotFound' do
-
-        let(:indices) do
-          double('indices').tap do |ind|
-            expect(ind).to receive(:delete).and_raise(Exception)
-          end
-        end
-
-        it 'raises an exception' do
-          expect {
-            DummyIndexingModelForRecreate.delete_index!
-          }.to raise_exception(Exception)
-        end
-      end
-    end
-
-    context 'when an index name is provided in the options' do
-
-      before do
-        expect(DummyIndexingModelForRecreate).to receive(:client).and_return(client)
-        expect(indices).to receive(:delete).with(index: 'custom-foo')
-      end
-
-      let(:client) do
-        double('client', indices: indices)
-      end
-
-      let(:indices) do
-        double('indices', delete: true)
-      end
-
-      it 'uses the index name' do
-        expect(DummyIndexingModelForRecreate.delete_index!(index: 'custom-foo'))
-      end
-    end
-  end
-
-  describe '#create_index' do
-
-    before(:all) do
-      class ::DummyIndexingModelForCreate
-        extend ActiveModel::Naming
-        extend Elasticsearch::Model::Naming::ClassMethods
-        extend Elasticsearch::Model::Indexing::ClassMethods
-
-        index_name 'foo'
-
-        settings index: { number_of_shards: 1 } do
-          mappings do
-            indexes :foo, analyzer: 'keyword'
-          end
-        end
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :DummyIndexingModelForCreate) if defined?(DummyIndexingModelForCreate)
-    end
-
-    let(:client) do
-      double('client', indices: indices)
-    end
-
-    let(:indices) do
-      double('indices')
-    end
-
-    context 'when the index does not exist' do
-
-      before do
-        expect(DummyIndexingModelForCreate).to receive(:client).and_return(client)
-        expect(DummyIndexingModelForCreate).to receive(:index_exists?).and_return(false)
-      end
-
-      context 'when options are not provided' do
-
-        let(:expected_body) do
-          { mappings: { _doc: { properties: { foo: { analyzer: 'keyword',
-                                                     type: 'text' } } } },
-            settings: { index: { number_of_shards: 1 } } }
-        end
-
-        before do
-          expect(indices).to receive(:create).with(index: 'foo', body: expected_body).and_return(true)
-        end
-
-        it 'creates the index' do
-          expect(DummyIndexingModelForCreate.create_index!).to be(true)
-        end
-      end
-
-      context 'when options are provided' do
-
-        let(:expected_body) do
-          { mappings: { foobar: { properties: { foo: { analyzer: 'bar' } } } },
-            settings: { index: { number_of_shards: 3 } } }
-        end
-
-        before do
-          expect(indices).to receive(:create).with(index: 'foobar', body: expected_body).and_return(true)
-        end
-
-        it 'creates the index' do
-          expect(DummyIndexingModelForCreate.create_index! \
-            index: 'foobar',
-            settings: { index: { number_of_shards: 3 } },
-            mappings: { foobar: { properties: { foo: { analyzer: 'bar' } } } }
-          ).to be(true)
-        end
-      end
-    end
-
-    context 'when the index exists' do
-
-      before do
-        expect(DummyIndexingModelForCreate).to receive(:index_exists?).and_return(true)
-        expect(indices).to receive(:create).never
-      end
-
-      it 'does not create the index' do
-        expect(DummyIndexingModelForCreate.create_index!).to be_nil
-      end
-    end
-
-    context 'when creating the index raises an exception' do
-
-      before do
-        expect(DummyIndexingModelForCreate).to receive(:client).and_return(client)
-        expect(DummyIndexingModelForCreate).to receive(:index_exists?).and_return(false)
-        expect(DummyIndexingModelForCreate).to receive(:delete_index!).and_return(true)
-        expect(indices).to receive(:create).and_raise(Exception)
-      end
-
-      it 'raises the exception' do
-        expect {
-          DummyIndexingModelForCreate.create_index!(force: true)
-        }.to raise_exception(Exception)
-      end
-    end
-
-    context 'when an index name is provided in the options' do
-
-      before do
-        expect(DummyIndexingModelForCreate).to receive(:client).and_return(client).twice
-        expect(indices).to receive(:exists).and_return(false)
-        expect(indices).to receive(:create).with(index: 'custom-foo', body: expected_body)
-      end
-
-      let(:expected_body) do
-        { mappings: { _doc: { properties: { foo: { analyzer: 'keyword',
-                                                   type: 'text' } } } },
-          settings: { index: { number_of_shards: 1 } } }
-      end
-
-      it 'uses the index name' do
-        expect(DummyIndexingModelForCreate.create_index!(index: 'custom-foo'))
-      end
-    end
-
-    context 'when the logging level is debug'
-  end
-
-  describe '#refresh_index!' do
-
-    before(:all) do
-      class ::DummyIndexingModelForRefresh
-        extend ActiveModel::Naming
-        extend Elasticsearch::Model::Naming::ClassMethods
-        extend Elasticsearch::Model::Indexing::ClassMethods
-
-        index_name 'foo'
-
-        settings index: { number_of_shards: 1 } do
-          mappings do
-            indexes :foo, analyzer: 'keyword'
-          end
-        end
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :DummyIndexingModelForRefresh) if defined?(DummyIndexingModelForRefresh)
-    end
-
-    let(:client) do
-      double('client', indices: indices, transport: double('transport', { logger: nil }))
-    end
-
-    let(:indices) do
-      double('indices')
-    end
-
-    before do
-      expect(DummyIndexingModelForRefresh).to receive(:client).at_most(3).times.and_return(client)
-    end
-
-    context 'when the force option is true' do
-
-      context 'when the operation raises a NotFound exception' do
-
-        before do
-          expect(indices).to receive(:refresh).and_raise(NotFound)
-        end
-
-        it 'does not raise an exception' do
-          expect(DummyIndexingModelForRefresh.refresh_index!(force: true)).to be_nil
-        end
-
-        context 'when the client has a logger' do
-
-          let(:logger) do
-            Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
-          end
-
-          let(:client) do
-            double('client', indices: indices, transport: double('transport', { logger: logger }))
-          end
-
-          it 'does not raise an exception' do
-            expect(DummyIndexingModelForRefresh.refresh_index!(force: true)).to be_nil
-          end
-
-          it 'logs the message that the index is not found' do
-            expect(logger).to receive(:debug)
-            expect(DummyIndexingModelForRefresh.refresh_index!(force: true)).to be_nil
-          end
-        end
-      end
-
-      context 'when the operation raises another type of exception' do
-
-        before do
-          expect(indices).to receive(:refresh).and_raise(Exception)
-        end
-
-        it 'does not raise an exception' do
-          expect {
-            DummyIndexingModelForRefresh.refresh_index!(force: true)
-          }.to raise_exception(Exception)
-        end
-      end
-    end
-
-    context 'when an index name is provided in the options' do
-
-      before do
-        expect(indices).to receive(:refresh).with(index: 'custom-foo')
-      end
-
-      it 'uses the index name' do
-        expect(DummyIndexingModelForRefresh.refresh_index!(index: 'custom-foo'))
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/module_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/module_spec.rb
deleted file mode 100644
index 0b8986d698..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/module_spec.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model do
-
-  describe '#client' do
-
-    it 'should have a default' do
-      expect(Elasticsearch::Model.client).to be_a(Elasticsearch::Transport::Client)
-    end
-  end
-
-  describe '#client=' do
-
-    before do
-      Elasticsearch::Model.client = 'Foobar'
-    end
-
-    it 'should allow the client to be set' do
-      expect(Elasticsearch::Model.client).to eq('Foobar')
-    end
-  end
-
-  describe 'mixin' do
-
-    before(:all) do
-      class ::DummyIncludingModel; end
-      class ::DummyIncludingModelWithSearchMethodDefined
-        def self.search(query, options={})
-          "SEARCH"
-        end
-      end
-
-      DummyIncludingModel.__send__ :include, Elasticsearch::Model
-    end
-
-    after(:all) do
-      remove_classes(DummyIncludingModel, DummyIncludingModelWithSearchMethodDefined)
-    end
-
-    it 'should include and set up the proxy' do
-      expect(DummyIncludingModel).to respond_to(:__elasticsearch__)
-      expect(DummyIncludingModel.new).to respond_to(:__elasticsearch__)
-    end
-
-    it 'should delegate methods to the proxy' do
-      expect(DummyIncludingModel).to respond_to(:search)
-      expect(DummyIncludingModel).to respond_to(:mapping)
-      expect(DummyIncludingModel).to respond_to(:settings)
-      expect(DummyIncludingModel).to respond_to(:index_name)
-      expect(DummyIncludingModel).to respond_to(:document_type)
-      expect(DummyIncludingModel).to respond_to(:import)
-    end
-
-    it 'should not interfere with existing methods' do
-      expect(DummyIncludingModelWithSearchMethodDefined.search('foo')).to eq('SEARCH')
-    end
-  end
-
-  describe '#settings' do
-
-    it 'allows access to the settings' do
-      expect(Elasticsearch::Model.settings).to eq({})
-    end
-
-    context 'when settings are changed' do
-
-      before do
-        Elasticsearch::Model.settings[:foo] = 'bar'
-      end
-
-      it 'persists the changes' do
-        expect(Elasticsearch::Model.settings[:foo]).to eq('bar')
-      end
-    end
-
-    context 'when \'inheritance_enabled\' is set' do
-
-      around do |example|
-        original_value = Elasticsearch::Model.settings[:inheritance_enabled]
-        example.run
-        Elasticsearch::Model.settings[:inheritance_enabled] = original_value
-      end
-
-      context 'when \'inheritance_enabled\' is true' do
-
-        it 'warns with a deprecation message' do
-          expect(Elasticsearch::Model).to receive(:warn)
-          Elasticsearch::Model.inheritance_enabled = true
-        end
-      end
-
-      context 'when \'inheritance_enabled\' is false' do
-
-        it 'does not warn' do
-          expect(Elasticsearch::Model).not_to receive(:warn)
-          Elasticsearch::Model.inheritance_enabled = false
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/multimodel_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/multimodel_spec.rb
deleted file mode 100644
index 44ee0bd845..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/multimodel_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Multimodel do
-
-  let(:multimodel) do
-    Elasticsearch::Model::Multimodel.new(model_1, model_2)
-  end
-
-  let(:model_1) do
-    double('Foo', index_name: 'foo_index', document_type: 'foo', to_ary: nil)
-  end
-
-  let(:model_2) do
-    double('Bar', index_name: 'bar_index', document_type: 'bar', to_ary: nil)
-  end
-
-  it 'has an index name' do
-    expect(multimodel.index_name).to eq(['foo_index', 'bar_index'])
-  end
-
-  it 'has an document type' do
-    expect(multimodel.document_type).to eq(['foo', 'bar'])
-  end
-
-  it 'has a client' do
-    expect(multimodel.client).to eq(Elasticsearch::Model.client)
-  end
-
-  describe 'the model registry' do
-
-    before(:all) do
-
-      class JustAModel
-        include Elasticsearch::Model
-      end
-
-      class JustAnotherModel
-        include Elasticsearch::Model
-      end
-    end
-
-    after(:all) do
-      remove_classes(JustAModel, JustAnotherModel)
-    end
-
-    let(:multimodel) do
-      Elasticsearch::Model::Multimodel.new
-    end
-
-    it 'includes model in the registry' do
-      expect(multimodel.models).to include(JustAModel)
-      expect(multimodel.models).to include(JustAnotherModel)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_inheritance_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_inheritance_spec.rb
deleted file mode 100644
index 764bc52955..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_inheritance_spec.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-require 'spec_helper'
-
-describe 'naming inheritance' do
-
-  context 'without using proxy' do
-    before(:all) do
-      TestBase = Class.new do
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-      end
-
-      Animal = Class.new TestBase do
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-
-        index_name "mammals"
-        document_type "mammal"
-      end
-
-      Dog = Class.new Animal
-
-      module ::MyNamespace
-        Dog = Class.new Animal
-      end
-
-      Cat = Class.new Animal do
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-
-        index_name "cats"
-        document_type "cat"
-      end
-
-    end
-
-    after(:all) do
-      remove_classes(TestBase, Animal, MyNamespace, Cat)
-    end
-
-    around(:all) do |example|
-      original_value = Elasticsearch::Model.inheritance_enabled
-      Elasticsearch::Model.inheritance_enabled = true
-      example.run
-      Elasticsearch::Model.inheritance_enabled = original_value
-    end
-
-    describe '#index_name' do
-
-      it 'returns the default index name' do
-        expect(TestBase.index_name).to eq('test_bases')
-        expect(TestBase.new.index_name).to eq('test_bases')
-      end
-
-      it 'returns the explicit index name' do
-        expect(Animal.index_name).to eq('mammals')
-        expect(Animal.new.index_name).to eq('mammals')
-
-        expect(Cat.index_name).to eq('cats')
-        expect(Cat.new.index_name).to eq('cats')
-      end
-
-      it 'returns the ancestor index name' do
-        expect(Dog.index_name).to eq('mammals')
-        expect(Dog.new.index_name).to eq('mammals')
-      end
-
-      it 'returns the ancestor index name for namespaced models' do
-        expect(::MyNamespace::Dog.index_name).to eq('mammals')
-        expect(::MyNamespace::Dog.new.index_name).to eq('mammals')
-      end
-    end
-
-    describe '#document_type' do
-
-      it 'returns nil' do
-        expect(TestBase.document_type).to eq('_doc')
-        expect(TestBase.new.document_type).to eq('_doc')
-      end
-
-      it 'returns the explicit document type' do
-        expect(Animal.document_type).to eq('mammal')
-        expect(Animal.new.document_type).to eq('mammal')
-
-        expect(Cat.document_type).to eq('cat')
-        expect(Cat.new.document_type).to eq('cat')
-      end
-
-      it 'returns the ancestor document type' do
-        expect(Dog.document_type).to eq('mammal')
-        expect(Dog.new.document_type).to eq('mammal')
-      end
-
-      it 'returns the ancestor document type for namespaced models' do
-        expect(::MyNamespace::Dog.document_type).to eq('mammal')
-        expect(::MyNamespace::Dog.new.document_type).to eq('mammal')
-      end
-    end
-  end
-
-  context 'when using proxy' do
-    before(:all) do
-      TestBase = Class.new do
-        extend ActiveModel::Naming
-
-        include Elasticsearch::Model
-      end
-
-      Animal = Class.new TestBase do
-        index_name "mammals"
-        document_type "mammal"
-      end
-
-      Dog = Class.new Animal
-
-      module MyNamespace
-        Dog = Class.new Animal
-      end
-
-      Cat = Class.new Animal do
-        index_name "cats"
-        document_type "cat"
-      end
-    end
-
-    after(:all) do
-      remove_classes(TestBase, Animal, MyNamespace, Cat)
-    end
-
-    around(:all) do |example|
-      original_value = Elasticsearch::Model.settings[:inheritance_enabled]
-      Elasticsearch::Model.settings[:inheritance_enabled] = true
-      example.run
-      Elasticsearch::Model.settings[:inheritance_enabled] = original_value
-    end
-
-    describe '#index_name' do
-
-      it 'returns the default index name' do
-        expect(TestBase.index_name).to eq('test_bases')
-      end
-
-      it 'returns the explicit index name' do
-        expect(Animal.index_name).to eq('mammals')
-
-        expect(Cat.index_name).to eq('cats')
-      end
-
-      it 'returns the ancestor index name' do
-        expect(Dog.index_name).to eq('mammals')
-      end
-
-      it 'returns the ancestor index name for namespaced models' do
-        expect(::MyNamespace::Dog.index_name).to eq('mammals')
-      end
-    end
-
-    describe '#document_type' do
-
-      it 'returns nil' do
-        expect(TestBase.document_type).to eq('_doc')
-      end
-
-      it 'returns the explicit document type' do
-        expect(Animal.document_type).to eq('mammal')
-
-        expect(Cat.document_type).to eq('cat')
-      end
-
-      it 'returns the ancestor document type' do
-        expect(Dog.document_type).to eq('mammal')
-      end
-
-      it 'returns the ancestor document type for namespaced models' do
-        expect(::MyNamespace::Dog.document_type).to eq('mammal')
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_spec.rb
deleted file mode 100644
index 8e0d8d54df..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/naming_spec.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-require 'spec_helper'
-
-describe 'naming' do
-
-  before(:all) do
-    class ::DummyNamingModel
-      extend ActiveModel::Naming
-
-      extend  Elasticsearch::Model::Naming::ClassMethods
-      include Elasticsearch::Model::Naming::InstanceMethods
-    end
-
-    module ::MyNamespace
-      class DummyNamingModelInNamespace
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-      end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyNamingModel, MyNamespace)
-  end
-
-  it 'returns the default index name' do
-    expect(DummyNamingModel.index_name).to eq('dummy_naming_models')
-    expect(DummyNamingModel.new.index_name).to eq('dummy_naming_models')
-  end
-
-  it 'returns the sanitized defualt index name for namespaced models' do
-    expect(::MyNamespace::DummyNamingModelInNamespace.index_name).to eq('my_namespace-dummy_naming_model_in_namespaces')
-    expect(::MyNamespace::DummyNamingModelInNamespace.new.index_name).to eq('my_namespace-dummy_naming_model_in_namespaces')
-  end
-
-  it 'returns the document type' do
-    expect(DummyNamingModel.document_type).to eq('_doc')
-    expect(DummyNamingModel.new.document_type).to eq('_doc')
-  end
-
-  describe '#index_name' do
-
-    context 'when the index name is set on the class' do
-
-      before do
-        DummyNamingModel.index_name 'foobar'
-      end
-
-      it 'sets the index_name' do
-        expect(DummyNamingModel.index_name).to eq('foobar')
-      end
-    end
-
-    context 'when the index name is set on an instance' do
-
-      before do
-        instance.index_name 'foobar_d'
-      end
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      it 'sets the index name on the instance' do
-        expect(instance.index_name).to eq('foobar_d')
-      end
-
-      context 'when the index name is set with a proc' do
-
-        before do
-          modifier = 'r'
-          instance.index_name Proc.new{ "foobar_#{modifier}" }
-        end
-
-        it 'sets the index name on the instance' do
-          expect(instance.index_name).to eq('foobar_r')
-        end
-      end
-    end
-  end
-
-  describe '#index_name=' do
-
-    before do
-      DummyNamingModel.index_name = 'foobar_index_S'
-    end
-
-    it 'changes the index name' do
-      expect(DummyNamingModel.index_name).to eq('foobar_index_S')
-    end
-
-    context 'when the method is called on an instance' do
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      before do
-        instance.index_name = 'foobar_index_s'
-      end
-
-      it 'changes the index name' do
-        expect(instance.index_name).to eq('foobar_index_s')
-      end
-
-      it 'does not change the index name on the class' do
-        expect(DummyNamingModel.index_name).to eq('foobar_index_S')
-      end
-    end
-
-    context 'when the index name is changed with a proc' do
-
-      before do
-        modifier2 = 'y'
-        DummyNamingModel.index_name = Proc.new{ "foobar_index_#{modifier2}" }
-      end
-
-      it 'changes the index name' do
-        expect(DummyNamingModel.index_name).to eq('foobar_index_y')
-      end
-    end
-  end
-
-  describe '#document_type' do
-
-    it 'returns the document type' do
-      expect(DummyNamingModel.document_type).to eq('_doc')
-    end
-
-    context 'when the method is called with an argument' do
-
-      before do
-        DummyNamingModel.document_type 'foo'
-      end
-
-      it 'changes the document type' do
-        expect(DummyNamingModel.document_type).to eq('foo')
-      end
-    end
-
-    context 'when the method is called on an instance' do
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      before do
-        instance.document_type 'foobar_d'
-      end
-
-      it 'changes the document type' do
-        expect(instance.document_type).to eq('foobar_d')
-      end
-    end
-  end
-
-  describe '#document_type=' do
-
-    context 'when the method is called on the class' do
-
-      before do
-        DummyNamingModel.document_type = 'foo_z'
-      end
-
-      it 'changes the document type' do
-        expect(DummyNamingModel.document_type).to eq('foo_z')
-      end
-    end
-
-    context 'when the method is called on an instance' do
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      before do
-        instance.document_type = 'foobar_b'
-      end
-
-      it 'changes the document type' do
-        expect(instance.document_type).to eq('foobar_b')
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/proxy_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/proxy_spec.rb
deleted file mode 100644
index 6e484f8968..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/proxy_spec.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Proxy do
-
-  before(:all) do
-    class ::DummyProxyModel
-      include Elasticsearch::Model::Proxy
-
-      def self.foo
-        'classy foo'
-      end
-
-      def bar
-        'insta barr'
-      end
-
-      def as_json(options)
-        {foo: 'bar'}
-      end
-    end
-
-    class ::DummyProxyModelWithCallbacks
-      def self.before_save(&block)
-        (@callbacks ||= {})[block.hash] = block
-      end
-
-      def changes_to_save
-        {:foo => ['One', 'Two']}
-      end
-    end
-
-    DummyProxyModelWithCallbacks.__send__ :include, Elasticsearch::Model::Proxy
-  end
-
-  after(:all) do
-    remove_classes(DummyProxyModel, DummyProxyModelWithCallbacks)
-  end
-
-  it 'sets up a proxy method on the class' do
-    expect(DummyProxyModel).to respond_to(:__elasticsearch__)
-  end
-
-  it 'sets up a proxy method on instances' do
-    expect(DummyProxyModel.new).to respond_to(:__elasticsearch__)
-  end
-
-  it 'sets up hooks for before_save callbacks' do
-    expect(DummyProxyModelWithCallbacks).to respond_to(:before_save)
-  end
-
-  it 'delegates methods to the target' do
-    expect(DummyProxyModel.__elasticsearch__).to respond_to(:foo)
-    expect(DummyProxyModel.__elasticsearch__.foo).to eq('classy foo')
-    expect(DummyProxyModel.new.__elasticsearch__).to respond_to(:bar)
-    expect(DummyProxyModel.new.__elasticsearch__.bar).to eq('insta barr')
-
-    expect {
-      DummyProxyModel.__elasticsearch__.xoxo
-    }.to raise_exception(NoMethodError)
-
-    expect {
-      DummyProxyModel.new.__elasticsearch__.xoxo
-    }.to raise_exception(NoMethodError)
-  end
-
-  it 'returns the proxy class from an instance proxy' do
-    expect(DummyProxyModel.new.__elasticsearch__.class.class).to eq(Elasticsearch::Model::Proxy::ClassMethodsProxy)
-  end
-
-  it 'returns the origin class from an instance proxy' do
-    expect(DummyProxyModel.new.__elasticsearch__.klass).to eq(DummyProxyModel)
-  end
-
-  it 'delegates #as_json from the proxy to the target' do
-    expect(DummyProxyModel.new.__elasticsearch__.as_json).to eq(foo: 'bar')
-  end
-
-  it 'includes the proxy in the inspect string' do
-    expect(DummyProxyModel.__elasticsearch__.inspect).to match(/PROXY/)
-    expect(DummyProxyModel.new.__elasticsearch__.inspect).to match(/PROXY/)
-  end
-
-  context 'when instances are cloned' do
-
-    let!(:model) do
-      DummyProxyModel.new
-    end
-
-    let!(:model_target) do
-      model.__elasticsearch__.target
-    end
-
-    let!(:duplicate) do
-      model.dup
-    end
-
-    let!(:duplicate_target) do
-      duplicate.__elasticsearch__.target
-    end
-
-    it 'resets the proxy target' do
-      expect(model).not_to eq(duplicate)
-      expect(model).to eq(model_target)
-      expect(duplicate).to eq(duplicate_target)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/aggregations_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/aggregations_spec.rb
deleted file mode 100644
index 2d1f8f509e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/aggregations_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Response::Aggregations do
-
-  before(:all) do
-    class OriginClass
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(OriginClass)
-  end
-
-  let(:response_document) do
-    {
-        'aggregations' => {
-            'foo' => {'bar' => 10 },
-            'price' => { 'doc_count' => 123,
-                         'min' => { 'value' => 1.0},
-                         'max' => { 'value' => 99 }
-            }
-        }
-    }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(OriginClass, '*').tap do |request|
-      allow(request).to receive(:execute!).and_return(response_document)
-    end
-  end
-
-  let(:aggregations) do
-    Elasticsearch::Model::Response::Response.new(OriginClass, search).aggregations
-  end
-
-  describe 'method delegation' do
-
-    it 'delegates methods to the response document' do
-      expect(aggregations.foo).to be_a(Hashie::Mash)
-      expect(aggregations.foo.bar).to be(10)
-    end
-  end
-
-  describe '#doc_count' do
-
-    it 'returns the doc count value from the response document' do
-      expect(aggregations.price.doc_count).to eq(123)
-    end
-  end
-
-  describe '#min' do
-
-    it 'returns the min value from the response document' do
-      expect(aggregations.price.min.value).to eq(1)
-    end
-  end
-
-  describe '#max' do
-
-    it 'returns the max value from the response document' do
-      expect(aggregations.price.max.value).to eq(99)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/base_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/base_spec.rb
deleted file mode 100644
index cfd77d7c78..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/base_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Response::Base do
-
-  before(:all) do
-    class DummyBaseClass
-      include Elasticsearch::Model::Response::Base
-    end
-
-    class OriginClass
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyBaseClass, OriginClass)
-  end
-
-  let(:response_document) do
-    { 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [] } }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(OriginClass, '*').tap do |request|
-      allow(request).to receive(:execute!).and_return(response_document)
-    end
-  end
-
-  let(:response) do
-    Elasticsearch::Model::Response::Response.new(OriginClass, search)
-  end
-
-  let(:response_base) do
-    DummyBaseClass.new(OriginClass, response)
-  end
-
-  describe '#klass' do
-
-    it 'returns the class' do
-      expect(response.klass).to be(OriginClass)
-    end
-  end
-
-  describe '#response' do
-
-    it 'returns the response object' do
-      expect(response_base.response).to eq(response)
-    end
-  end
-
-  describe 'response document' do
-
-    it 'returns the response document' do
-      expect(response_base.response.response).to eq(response_document)
-    end
-  end
-
-  describe '#total' do
-
-    it 'returns the total' do
-      expect(response_base.total).to eq(123)
-    end
-  end
-
-  describe '#max_score' do
-
-    it 'returns the total' do
-      expect(response_base.max_score).to eq(456)
-    end
-  end
-
-  describe '#results' do
-
-    it 'raises a NotImplemented error' do
-      expect {
-        response_base.results
-      }.to raise_exception(Elasticsearch::Model::NotImplemented)
-    end
-  end
-
-  describe '#records' do
-
-    it 'raises a NotImplemented error' do
-      expect {
-        response_base.records
-      }.to raise_exception(Elasticsearch::Model::NotImplemented)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/kaminari_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/kaminari_spec.rb
deleted file mode 100644
index e8fe1f86be..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/kaminari_spec.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Response::Response Kaminari' do
-
-  before(:all) do
-    class ModelClass
-      include ::Kaminari::ConfigurationMethods
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(ModelClass)
-  end
-
-  let(:response_document) do
-    { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'},
-      'hits' => { 'total' => 100, 'hits' => (1..100).to_a.map { |i| { _id: i } } } }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(model, '*')
-  end
-
-  let(:response) do
-    allow(model).to receive(:client).and_return(client)
-    Elasticsearch::Model::Response::Response.new(model, search, response_document).tap do |resp|
-      allow(resp).to receive(:client).and_return(client)
-    end
-  end
-
-  let(:client) do
-    double('client')
-  end
-
-  shared_examples_for 'a search request that can be paginated' do
-
-    describe '#page' do
-
-      it 'does not set an initial from and size on the search definition' do
-        expect(response.search.definition[:from]).to be(nil)
-        expect(response.search.definition[:size]).to be(nil)
-      end
-
-      context 'when page is called once' do
-
-        let(:search_request) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
-        end
-
-        before do
-          expect(client).to receive(:search).with(search_request).and_return(response_document)
-          response.page(2).to_a
-        end
-
-        it 'advances the from/size in the search request' do
-          expect(response.search.definition[:from]).to be(25)
-          expect(response.search.definition[:size]).to be(25)
-        end
-      end
-
-      context 'when page is called more than once' do
-
-        let(:search_request_one) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
-        end
-
-        let(:search_request_two) do
-          { index: index_field, from: 75, size: 25, q: '*', type: type_field}
-        end
-
-        before do
-          expect(client).to receive(:search).with(search_request_one).and_return(response_document)
-          response.page(2).to_a
-          expect(client).to receive(:search).with(search_request_two).and_return(response_document)
-          response.page(4).to_a
-        end
-
-        it 'advances the from/size in the search request' do
-          expect(response.search.definition[:from]).to be(75)
-          expect(response.search.definition[:size]).to be(25)
-        end
-      end
-
-      context 'when limit is also set' do
-
-        before do
-          response.records
-          response.results
-        end
-
-        context 'when page is called before limit' do
-
-          before do
-            response.page(3).limit(35)
-          end
-
-          it 'sets the correct values' do
-            expect(response.search.definition[:size]).to eq(35)
-            expect(response.search.definition[:from]).to eq(70)
-          end
-
-          it 'resets the instance variables' do
-            expect(response.instance_variable_get(:@response)).to be(nil)
-            expect(response.instance_variable_get(:@records)).to be(nil)
-            expect(response.instance_variable_get(:@results)).to be(nil)
-          end
-        end
-
-        context 'when limit is called before page' do
-
-          before do
-            response.limit(35).page(3)
-          end
-
-          it 'sets the correct values' do
-            expect(response.search.definition[:size]).to eq(35)
-            expect(response.search.definition[:from]).to eq(70)
-          end
-
-          it 'resets the instance variables' do
-            expect(response.instance_variable_get(:@response)).to be(nil)
-            expect(response.instance_variable_get(:@records)).to be(nil)
-            expect(response.instance_variable_get(:@results)).to be(nil)
-          end
-        end
-      end
-    end
-
-    describe '#limit_value' do
-
-      context 'when there is no default set' do
-
-        it 'uses the limit value from the Kaminari configuration' do
-          expect(response.limit_value).to eq(Kaminari.config.default_per_page)
-        end
-      end
-
-      context 'when there is a limit in the search definition' do
-
-        let(:search) do
-          Elasticsearch::Model::Searching::SearchRequest.new(model, '*', size: 10)
-        end
-
-        it 'gets the limit from the search definition' do
-          expect(response.limit_value).to eq(10)
-        end
-      end
-
-      context 'when there is a limit in the search body' do
-
-        let(:search) do
-          Elasticsearch::Model::Searching::SearchRequest.new(model, { query: { match_all: {} }, size: 999 })
-        end
-
-        it 'does not use the limit' do
-          expect(response.limit_value).to be(Kaminari.config.default_per_page)
-        end
-      end
-    end
-
-    describe '#offset_value' do
-
-      context 'when there is no default set' do
-
-        it 'uses an offset of 0' do
-          expect(response.offset_value).to eq(0)
-        end
-      end
-
-      context 'when there is an offset in the search definition' do
-
-        let(:search) do
-          Elasticsearch::Model::Searching::SearchRequest.new(model, '*', from: 50)
-        end
-
-        it 'gets the limit from the search definition' do
-          expect(response.offset_value).to eq(50)
-        end
-      end
-
-      context 'when there is an offset in the search body' do
-
-        let(:search) do
-          Elasticsearch::Model::Searching::SearchRequest.new(model, { query: { match_all: {} }, from: 333 })
-        end
-
-        it 'does not use the offset' do
-          expect(response.offset_value).to be(0)
-        end
-      end
-    end
-
-    describe '#limit' do
-
-      context 'when a limit is set' do
-
-        before do
-          response.records
-          response.results
-          response.limit(35)
-        end
-
-        it 'sets the limit on the search defintiion' do
-          expect(response.search.definition[:size]).to eq(35)
-        end
-
-        it 'resets the instance variables' do
-          expect(response.instance_variable_get(:@response)).to be(nil)
-          expect(response.instance_variable_get(:@records)).to be(nil)
-          expect(response.instance_variable_get(:@results)).to be(nil)
-        end
-
-        context 'when the limit is provided as a string' do
-
-          before do
-            response.limit('35')
-          end
-
-          it 'coerces the string to an integer' do
-            expect(response.search.definition[:size]).to eq(35)
-          end
-        end
-
-        context 'when the limit is an invalid type' do
-
-          before do
-            response.limit('asdf')
-          end
-
-          it 'does not apply the setting' do
-            expect(response.search.definition[:size]).to eq(35)
-          end
-        end
-      end
-    end
-
-    describe '#offset' do
-
-      context 'when an offset is set' do
-
-        before do
-          response.records
-          response.results
-          response.offset(15)
-        end
-
-        it 'sets the limit on the search defintiion' do
-          expect(response.search.definition[:from]).to eq(15)
-        end
-
-        it 'resets the instance variables' do
-          expect(response.instance_variable_get(:@response)).to be(nil)
-          expect(response.instance_variable_get(:@records)).to be(nil)
-          expect(response.instance_variable_get(:@results)).to be(nil)
-        end
-
-        context 'when the offset is provided as a string' do
-
-          before do
-            response.offset('15')
-          end
-
-          it 'coerces the string to an integer' do
-            expect(response.search.definition[:from]).to eq(15)
-          end
-        end
-
-        context 'when the offset is an invalid type' do
-
-          before do
-            response.offset('asdf')
-          end
-
-          it 'does not apply the setting' do
-            expect(response.search.definition[:from]).to eq(0)
-          end
-        end
-      end
-    end
-
-    describe '#total' do
-
-      before do
-        allow(response.results).to receive(:total).and_return(100)
-      end
-
-      it 'returns the total number of hits' do
-        expect(response.total_count).to eq(100)
-      end
-    end
-
-    context 'results' do
-
-      before do
-        allow(search).to receive(:execute!).and_return(response_document)
-      end
-
-      describe '#current_page' do
-
-        it 'returns the current page' do
-          expect(response.results.current_page).to eq(1)
-        end
-
-        context 'when a particular page is accessed' do
-
-          it 'returns the correct current page' do
-            expect(response.page(5).results.current_page).to eq(5)
-          end
-        end
-      end
-
-      describe '#prev_page' do
-
-        it 'returns the previous page' do
-          expect(response.page(1).results.prev_page).to be(nil)
-          expect(response.page(2).results.prev_page).to be(1)
-          expect(response.page(3).results.prev_page).to be(2)
-          expect(response.page(4).results.prev_page).to be(3)
-        end
-      end
-
-      describe '#next_page' do
-
-        it 'returns the previous page' do
-          expect(response.page(1).results.next_page).to be(2)
-          expect(response.page(2).results.next_page).to be(3)
-          expect(response.page(3).results.next_page).to be(4)
-          expect(response.page(4).results.next_page).to be(nil)
-        end
-      end
-    end
-
-    context 'records' do
-
-      before do
-        allow(search).to receive(:execute!).and_return(response_document)
-      end
-
-      describe '#current_page' do
-
-        it 'returns the current page' do
-          expect(response.records.current_page).to eq(1)
-        end
-
-        context 'when a particular page is accessed' do
-
-          it 'returns the correct current page' do
-            expect(response.page(5).records.current_page).to eq(5)
-          end
-        end
-      end
-
-      describe '#prev_page' do
-
-        it 'returns the previous page' do
-          expect(response.page(1).records.prev_page).to be(nil)
-          expect(response.page(2).records.prev_page).to be(1)
-          expect(response.page(3).records.prev_page).to be(2)
-          expect(response.page(4).records.prev_page).to be(3)
-        end
-      end
-
-      describe '#next_page' do
-
-        it 'returns the previous page' do
-          expect(response.page(1).records.next_page).to be(2)
-          expect(response.page(2).records.next_page).to be(3)
-          expect(response.page(3).records.next_page).to be(4)
-          expect(response.page(4).records.next_page).to be(nil)
-        end
-      end
-    end
-  end
-
-  context 'when the model is a single one' do
-
-    let(:model) do
-      ModelClass
-    end
-
-    let(:type_field) do
-      'bar'
-    end
-
-    let(:index_field) do
-      'foo'
-    end
-
-    it_behaves_like 'a search request that can be paginated'
-  end
-
-  context 'when the model is a multimodel' do
-
-    let(:model) do
-      Elasticsearch::Model::Multimodel.new(ModelClass)
-    end
-
-    let(:type_field) do
-      ['bar']
-    end
-
-    let(:index_field) do
-      ['foo']
-    end
-
-    it_behaves_like 'a search request that can be paginated'
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/will_paginate_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/will_paginate_spec.rb
deleted file mode 100644
index 0666b0f285..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/pagination/will_paginate_spec.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-require 'spec_helper'
-
-describe 'Elasticsearch::Model::Response::Response WillPaginate' do
-
-  before(:all) do
-    class ModelClass
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-
-      def self.per_page
-        33
-      end
-    end
-
-    # Subclass Response so we can include WillPaginate module without conflicts with Kaminari.
-    class WillPaginateResponse < Elasticsearch::Model::Response::Response
-      include Elasticsearch::Model::Response::Pagination::WillPaginate
-    end
-  end
-
-  after(:all) do
-    remove_classes(ModelClass, WillPaginateResponse)
-  end
-
-  let(:response_document) do
-    { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'},
-      'hits' => { 'total' => 100, 'hits' => (1..100).to_a.map { |i| { _id: i } } } }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(model, '*')
-  end
-
-  let(:response) do
-    allow(model).to receive(:client).and_return(client)
-    WillPaginateResponse.new(model, search, response_document).tap do |resp|
-      allow(resp).to receive(:client).and_return(client)
-    end
-  end
-
-  let(:client) do
-    double('client')
-  end
-
-  shared_examples_for 'a search request that can be paginated' do
-
-    describe '#offset' do
-
-      context 'when per_page and page are set' do
-
-        before do
-          response.per_page(3).page(3)
-        end
-
-        it 'sets the correct offset' do
-          expect(response.offset).to eq(6)
-        end
-      end
-    end
-
-    describe '#length' do
-
-      context 'when per_page and page are set' do
-
-        before do
-          response.per_page(3).page(3)
-        end
-
-        it 'sets the correct offset' do
-          expect(response.length).to eq(3)
-        end
-      end
-    end
-
-    describe '#paginate' do
-
-      context 'when there are no settings' do
-
-        context 'when page is set to nil' do
-
-          before do
-            response.paginate(page: nil)
-          end
-
-          it 'uses the defaults' do
-            expect(response.search.definition[:size]).to eq(default_per_page)
-            expect(response.search.definition[:from]).to eq(0)
-          end
-        end
-
-        context 'when page is set to a value' do
-
-          before do
-            response.paginate(page: 2)
-          end
-
-          it 'uses the defaults' do
-            expect(response.search.definition[:size]).to eq(default_per_page)
-            expect(response.search.definition[:from]).to eq(default_per_page)
-          end
-        end
-
-        context 'when a custom page and per_page is set' do
-
-          before do
-            response.paginate(page: 3, per_page: 9)
-          end
-
-          it 'uses the custom values' do
-            expect(response.search.definition[:size]).to eq(9)
-            expect(response.search.definition[:from]).to eq(18)
-          end
-        end
-
-        context 'fall back to first page if invalid value is provided' do
-
-          before do
-            response.paginate(page: -1)
-          end
-
-          it 'uses the custom values' do
-            expect(response.search.definition[:size]).to eq(default_per_page)
-            expect(response.search.definition[:from]).to eq(0)
-          end
-        end
-      end
-    end
-
-    describe '#page' do
-
-      context 'when a value is provided for page' do
-
-        before do
-          response.page(5)
-        end
-
-        it 'calculates the correct :size and :from' do
-          expect(response.search.definition[:size]).to eq(default_per_page)
-          expect(response.search.definition[:from]).to eq(default_per_page * 4)
-        end
-      end
-
-      context 'when a value is provided for page and per_page' do
-
-        before do
-          response.page(5).per_page(3)
-        end
-
-        it 'calculates the correct :size and :from' do
-          expect(response.search.definition[:size]).to eq(3)
-          expect(response.search.definition[:from]).to eq(12)
-        end
-      end
-
-      context 'when a value is provided for per_page and page' do
-
-        before do
-          response.per_page(3).page(5)
-        end
-
-        it 'calculates the correct :size and :from' do
-          expect(response.search.definition[:size]).to eq(3)
-          expect(response.search.definition[:from]).to eq(12)
-        end
-      end
-    end
-
-    describe '#current_page' do
-
-      context 'when no values are set' do
-
-        before do
-          response.paginate({})
-        end
-
-        it 'returns the first page' do
-          expect(response.current_page).to eq(1)
-        end
-      end
-
-      context 'when values are provided for per_page and page' do
-
-        before do
-          response.paginate(page: 3, per_page: 9)
-        end
-
-        it 'calculates the correct current page' do
-          expect(response.current_page).to eq(3)
-        end
-      end
-
-      context 'when #paginate has not been called on the response' do
-
-        it 'returns nil' do
-          expect(response.current_page).to be_nil
-        end
-      end
-    end
-
-    describe '#per_page' do
-
-      context 'when a value is set via the #paginate method' do
-
-        before do
-          response.paginate(per_page: 8)
-        end
-
-        it 'returns the per_page value' do
-          expect(response.per_page).to eq(8)
-        end
-      end
-
-      context 'when a value is set via the #per_page method' do
-
-        before do
-          response.per_page(8)
-        end
-
-        it 'returns the per_page value' do
-          expect(response.per_page).to eq(8)
-        end
-      end
-    end
-
-    describe '#total_entries' do
-
-      before do
-        allow(response).to receive(:results).and_return(double('results', total: 100))
-      end
-
-      it 'returns the total results' do
-        expect(response.total_entries).to eq(100)
-      end
-    end
-  end
-
-  context 'when the model is a single one' do
-
-    let(:model) do
-      ModelClass
-    end
-
-    let(:default_per_page) do
-      33
-    end
-
-    it_behaves_like 'a search request that can be paginated'
-  end
-
-  context 'when the model is a multimodel' do
-
-    let(:model) do
-      Elasticsearch::Model::Multimodel.new(ModelClass)
-    end
-
-    let(:default_per_page) do
-      ::WillPaginate.per_page
-    end
-
-    it_behaves_like 'a search request that can be paginated'
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/records_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/records_spec.rb
deleted file mode 100644
index 882c763f38..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/records_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Response::Records do
-
-  before(:all) do
-    class DummyCollection
-      include Enumerable
-
-      def each(&block); ['FOO'].each(&block); end
-      def size;         ['FOO'].size;         end
-      def empty?;       ['FOO'].empty?;       end
-      def foo;          'BAR';                end
-    end
-
-    class DummyModel
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-
-      def self.find(*args)
-        DummyCollection.new
-      end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyCollection, DummyModel)
-  end
-
-  let(:response_document) do
-    { 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [{'_id' => '1', 'foo' => 'bar'}] } }
-  end
-
-  let(:results) do
-    Elasticsearch::Model::Response::Results.new(DummyModel, response_document)
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(DummyModel, '*').tap do |request|
-      allow(request).to receive(:execute!).and_return(response_document)
-    end
-  end
-
-  let(:response) do
-    Elasticsearch::Model::Response::Response.new(DummyModel, search)
-  end
-
-  let(:records) do
-    described_class.new(DummyModel, response)
-  end
-
-  context 'when the records are accessed' do
-
-    it 'returns the records' do
-      expect(records.records.size).to eq(1)
-      expect(records.records.first).to eq('FOO')
-    end
-
-    it 'delegates methods to records' do
-      expect(records.foo).to eq('BAR')
-    end
-  end
-
-  describe '#each_with_hit' do
-
-    it 'returns each record with its Elasticsearch hit' do
-      records.each_with_hit do |record, hit|
-        expect(record).to eq('FOO')
-        expect(hit.foo).to eq('bar')
-      end
-    end
-  end
-
-  describe '#map_with_hit' do
-
-    let(:value) do
-      records.map_with_hit { |record, hit| "#{record}---#{hit.foo}" }
-    end
-
-    it 'returns each record with its Elasticsearch hit' do
-      expect(value).to eq(['FOO---bar'])
-    end
-  end
-
-  describe '#ids' do
-
-    it 'returns the ids' do
-      expect(records.ids).to eq(['1'])
-    end
-  end
-
-  context 'when an adapter is used' do
-
-    before do
-      module DummyAdapter
-        module RecordsMixin
-          def records
-            ['FOOBAR']
-          end
-        end
-
-        def records_mixin
-          RecordsMixin
-        end; module_function :records_mixin
-      end
-
-      allow(Elasticsearch::Model::Adapter).to receive(:from_class).and_return(DummyAdapter)
-    end
-
-    after do
-      Elasticsearch::Model::Adapter::Adapter.adapters.delete(DummyAdapter)
-      Object.send(:remove_const, :DummyAdapter) if defined?(DummyAdapter)
-    end
-
-    it 'delegates the records method to the adapter' do
-      expect(records.records).to eq(['FOOBAR'])
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/response_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/response_spec.rb
deleted file mode 100644
index 32f96a4d2e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/response_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Response::Response do
-
-  before(:all) do
-    class OriginClass
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(OriginClass)
-  end
-
-  let(:response_document) do
-    { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'}, 'hits' => { 'hits' => [] },
-      'aggregations' => {'foo' => {'bar' => 10}},
-      'suggest' => {'my_suggest' => [ { 'text' => 'foo', 'options' => [ { 'text' => 'Foo', 'score' => 2.0 },
-                                                                        { 'text' => 'Bar', 'score' => 1.0 } ] } ]}}
-
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(OriginClass, '*').tap do |request|
-      allow(request).to receive(:execute!).and_return(response_document)
-    end
-  end
-
-  let(:response) do
-    Elasticsearch::Model::Response::Response.new(OriginClass, search)
-  end
-
-  it 'performs the Elasticsearch request lazily' do
-    expect(search).not_to receive(:execute!)
-    response
-  end
-
-  describe '#klass' do
-
-    it 'returns the class' do
-      expect(response.klass).to be(OriginClass)
-    end
-  end
-
-  describe '#search' do
-
-    it 'returns the search object' do
-      expect(response.search).to eq(search)
-    end
-  end
-
-  describe '#took' do
-
-    it 'returns the took field' do
-      expect(response.took).to eq('5')
-    end
-  end
-
-  describe '#timed_out' do
-
-    it 'returns the timed_out field' do
-      expect(response.timed_out).to eq(false)
-    end
-  end
-
-  describe '#shards' do
-
-    it 'returns a Hashie::Mash' do
-      expect(response.shards.one).to eq('OK')
-    end
-  end
-
-  describe '#response' do
-
-    it 'returns the response document' do
-      expect(response.response).to eq(response_document)
-    end
-  end
-
-  describe '#results' do
-
-    it 'provides access to the results' do
-      expect(response.results).to be_a(Elasticsearch::Model::Response::Results)
-      expect(response.size).to be(0)
-    end
-  end
-
-  describe '#records' do
-
-    it 'provides access to the records' do
-      expect(response.records).to be_a(Elasticsearch::Model::Response::Records)
-      expect(response.size).to be(0)
-    end
-  end
-
-  describe 'enumerable methods' do
-
-    it 'delegates the methods to the results' do
-      expect(response.empty?).to be(true)
-    end
-  end
-
-  describe 'aggregations' do
-
-    it 'provides access to the aggregations' do
-      expect(response.aggregations).to be_a(Hashie::Mash)
-      expect(response.aggregations.foo.bar).to eq(10)
-    end
-  end
-
-  describe 'suggestions' do
-
-    it 'provides access to the suggestions' do
-      expect(response.suggestions).to be_a(Hashie::Mash)
-      expect(response.suggestions.my_suggest.first.options.first.text).to eq('Foo')
-      expect(response.suggestions.terms).to eq([ 'Foo', 'Bar' ])
-    end
-
-    context 'when there are no suggestions' do
-
-      let(:response_document) do
-        { }
-      end
-
-      it 'returns an empty list' do
-        expect(response.suggestions.terms).to eq([ ])
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/result_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/result_spec.rb
deleted file mode 100644
index 6f1298a2b8..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/result_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper'
-require 'active_support/json/encoding'
-
-describe Elasticsearch::Model::Response::Result do
-
-  let(:result) do
-    described_class.new(foo: 'bar', bar: { bam: 'baz' })
-  end
-
-  it 'provides access to the properties' do
-    expect(result.foo).to eq('bar')
-    expect(result.bar.bam).to eq('baz')
-    expect { result.xoxo }.to raise_exception(NoMethodError)
-  end
-
-  describe '#id' do
-
-    let(:result) do
-      described_class.new(foo: 'bar', _id: 42, _source: { id: 12 })
-    end
-
-    it 'returns the _id field' do
-      expect(result.id).to eq(42)
-    end
-
-    it 'provides access to the source id field' do
-      expect(result._source.id).to eq(12)
-    end
-  end
-
-  describe '#type' do
-
-    let(:result) do
-      described_class.new(foo: 'bar', _type: 'baz', _source: { type: 'BAM' })
-    end
-
-    it 'returns the _type field' do
-      expect(result.type).to eq('baz')
-    end
-
-    it 'provides access to the source type field' do
-      expect(result._source.type).to eq('BAM')
-    end
-  end
-
-  describe 'method delegation' do
-
-    let(:result) do
-      described_class.new(foo: 'bar', _source: { bar: { bam: 'baz' } })
-    end
-
-    it 'provides access to the _source field via a method' do
-      expect(result._source).to eq('bar' => { 'bam' => 'baz' })
-    end
-
-    it 'is recognized by #method' do
-      expect(result.method :bar).to be_a Method
-    end
-
-    it 'respond_to? still works' do
-      expect(result.respond_to? :bar).to be true
-    end
-
-    context 'when methods map to keys in subdocuments of the response from Elasticsearch' do
-
-      it 'provides access to top level fields via a method' do
-        expect(result.foo).to eq('bar')
-        expect(result.fetch(:foo)).to eq('bar')
-        expect(result.fetch(:does_not_exist, 'moo')).to eq('moo')
-      end
-
-      it 'responds to hash methods' do
-        expect(result.keys).to eq(['foo', '_source'])
-        expect(result.to_hash).to eq('foo' => 'bar', '_source' => { 'bar' => { 'bam' => 'baz' } })
-      end
-
-      it 'provides access to fields in the _source subdocument via a method' do
-        expect(result.bar).to eq('bam' => 'baz')
-        expect(result.bar.bam).to eq('baz')
-        expect(result._source.bar).to eq('bam' => 'baz')
-        expect(result._source.bar.bam).to eq('baz')
-      end
-
-      context 'when boolean methods are called' do
-
-        it 'provides access to top level fields via a method' do
-          expect(result.foo?).to eq(true)
-          expect(result.boo?).to eq(false)
-        end
-
-        it 'delegates to fields in the _source subdocument via a method' do
-          expect(result.bar?).to eq(true)
-          expect(result.bar.bam?).to eq(true)
-          expect(result.boo?).to eq(false)
-          expect(result.bar.boo?).to eq(false)
-          expect(result._source.bar?).to eq(true)
-          expect(result._source.bar.bam?).to eq(true)
-          expect(result._source.boo?).to eq(false)
-          expect(result._source.bar.boo?).to eq(false)
-        end
-      end
-    end
-
-    context 'when methods do not map to keys in subdocuments of the response from Elasticsearch' do
-
-      it 'raises a NoMethodError' do
-        expect { result.does_not_exist }.to raise_exception(NoMethodError)
-      end
-    end
-  end
-
-  describe '#as_json' do
-
-    let(:result) do
-      described_class.new(foo: 'bar', _source: { bar: { bam: 'baz' } })
-    end
-
-    it 'returns a json string' do
-      expect(result.as_json(except: 'foo')).to eq({'_source'=>{'bar'=>{'bam'=>'baz'}}})
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/results_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/results_spec.rb
deleted file mode 100644
index f7149003d2..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/response/results_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Response::Results do
-
-  before(:all) do
-    class OriginClass
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(OriginClass)
-  end
-
-  let(:response_document) do
-    { 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [{'foo' => 'bar'}] } }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(OriginClass, '*').tap do |request|
-      allow(request).to receive(:execute!).and_return(response_document)
-    end
-  end
-
-  let(:response) do
-    Elasticsearch::Model::Response::Response.new(OriginClass, search)
-  end
-
-  let(:results) do
-    response.results
-  end
-
-  describe '#results' do
-
-    it 'provides access to the results' do
-      expect(results.results.size).to be(1)
-      expect(results.results.first.foo).to eq('bar')
-    end
-  end
-
-  describe 'Enumerable' do
-
-    it 'deletebates enumerable methods to the results' do
-      expect(results.empty?).to be(false)
-      expect(results.first.foo).to eq('bar')
-    end
-  end
-
-  describe '#raw_response' do
-
-    it 'returns the raw response document' do
-      expect(response.raw_response).to eq(response_document)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_search_request_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_search_request_spec.rb
deleted file mode 100644
index db3ac6dab3..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_search_request_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Serializing do
-
-  before(:all) do
-    class ::DummySearchingModel
-      extend Elasticsearch::Model::Searching::ClassMethods
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummySearchingModel)
-  end
-
-  before do
-    allow(DummySearchingModel).to receive(:client).and_return(client)
-  end
-
-  let(:client) do
-    double('client')
-  end
-
-  describe '#initialize' do
-
-    context 'when the search definition is a simple query' do
-
-      before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo').and_return({})
-      end
-
-      let(:search) do
-        Elasticsearch::Model::Searching::SearchRequest.new(DummySearchingModel, 'foo')
-      end
-
-      it 'passes the query to the client' do
-        expect(search.execute!).to eq({})
-      end
-    end
-
-    context 'when the search definition is a hash' do
-
-      before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: { foo: 'bar' }).and_return({})
-      end
-
-      let(:search) do
-        Elasticsearch::Model::Searching::SearchRequest.new(DummySearchingModel, foo: 'bar')
-      end
-
-      it 'passes the hash to the client' do
-        expect(search.execute!).to eq({})
-      end
-    end
-
-    context 'when the search definition is a json string' do
-
-      before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: '{"foo":"bar"}').and_return({})
-      end
-
-      let(:search) do
-        Elasticsearch::Model::Searching::SearchRequest.new(DummySearchingModel, '{"foo":"bar"}')
-      end
-
-      it 'passes the json string to the client' do
-        expect(search.execute!).to eq({})
-      end
-    end
-
-    context 'when the search definition is a custom object' do
-
-      before(:all) do
-        class MySpecialQueryBuilder
-          def to_hash; {foo: 'bar'}; end
-        end
-      end
-
-      after(:all) do
-        Object.send(:remove_const, :MySpecialQueryBuilder) if defined?(MySpecialQueryBuilder)
-      end
-
-      before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: {foo: 'bar'}).and_return({})
-      end
-
-      let(:search) do
-        Elasticsearch::Model::Searching::SearchRequest.new(DummySearchingModel, MySpecialQueryBuilder.new)
-      end
-
-      it 'passes the query builder to the client and calls #to_hash on it' do
-        expect(search.execute!).to eq({})
-      end
-    end
-
-    context 'when extra options are specified' do
-
-      before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo', size: 15).and_return({})
-      end
-
-      let(:search) do
-        Elasticsearch::Model::Searching::SearchRequest.new(DummySearchingModel, 'foo', size: 15)
-      end
-
-      it 'passes the extra options to the client as part of the request' do
-        expect(search.execute!).to eq({})
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_spec.rb
deleted file mode 100644
index ca95f282b4..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/searching_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Searching::ClassMethods do
-
-  before(:all) do
-    class ::DummySearchingModel
-      extend Elasticsearch::Model::Searching::ClassMethods
-
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummySearchingModel)
-  end
-
-  it 'has the search method' do
-    expect(DummySearchingModel).to respond_to(:search)
-  end
-
-  describe '#search' do
-
-    let(:response) do
-      double('search', execute!: { 'hits' => {'hits' => [ {'_id' => 2 }, {'_id' => 1 } ]} })
-    end
-
-    before do
-      expect(Elasticsearch::Model::Searching::SearchRequest).to receive(:new).with(DummySearchingModel, 'foo', { default_operator: 'AND' }).and_return(response)
-    end
-
-    it 'creates a search object' do
-      expect(DummySearchingModel.search('foo', default_operator: 'AND')).to be_a(Elasticsearch::Model::Response::Response)
-    end
-  end
-
-  describe 'lazy execution' do
-
-    let(:response) do
-      double('search').tap do |r|
-        expect(r).to receive(:execute!).never
-      end
-    end
-
-    it 'does not execute the search until the results are accessed' do
-      DummySearchingModel.search('foo')
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/serializing_spec.rb b/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/serializing_spec.rb
deleted file mode 100644
index ac4a850f38..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/elasticsearch/model/serializing_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Elasticsearch::Model::Serializing do
-
-  before(:all) do
-    class DummyClass
-      include Elasticsearch::Model::Serializing::InstanceMethods
-
-      def as_json(options={})
-        'HASH'
-      end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyClass)
-  end
-
-  it 'delegates to #as_json by default' do
-    expect(DummyClass.new.as_indexed_json).to eq('HASH')
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/spec_helper.rb b/elasticsearch-rails/elasticsearch-model/spec/spec_helper.rb
deleted file mode 100644
index 9e46a27dea..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/spec_helper.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'pry-nav'
-require 'kaminari'
-require 'kaminari/version'
-require 'will_paginate'
-require 'will_paginate/collection'
-require 'elasticsearch/model'
-require 'hashie/version'
-require 'active_model'
-require 'mongoid'
-require 'yaml'
-require 'active_record'
-
-unless defined?(ELASTICSEARCH_URL)
-  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
-end
-
-RSpec.configure do |config|
-  config.formatter = 'documentation'
-  config.color = true
-
-  config.before(:suite) do
-    require 'ansi'
-    tracer = ::Logger.new(STDERR)
-    tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                                            tracer: (ENV['QUIET'] ? nil : tracer)
-
-    unless ActiveRecord::Base.connected?
-      ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
-    end
-    require 'support/app'
-
-    if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
-      ::ActiveRecord::Base.raise_in_transactional_callbacks = true
-    end
-  end
-
-  config.after(:all) do
-    drop_all_tables!
-    delete_all_indices!
-  end
-end
-
-# Is the ActiveRecord version at least 4.0?
-#
-# @return [ true, false ] Whether the ActiveRecord version is at least 4.0.
-#
-# @since 6.0.1
-def active_record_at_least_4?
-  defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
-end
-
-# Delete all documents from the indices of the provided list of models.
-#
-# @param [ Array<ActiveRecord::Base> ] models The list of models.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def clear_indices(*models)
-  models.each do |model|
-    begin; Elasticsearch::Model.client.delete_by_query(index: model.index_name, q: '*'); rescue; end
-  end and true
-end
-
-# Delete all documents from the tables of the provided list of models.
-#
-# @param [ Array<ActiveRecord::Base> ] models The list of models.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def clear_tables(*models)
-  begin; models.map(&:delete_all); rescue; end and true
-end
-
-# Drop all tables of models registered as subclasses of ActiveRecord::Base.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def drop_all_tables!
-  ActiveRecord::Base.descendants.each do |model|
-    begin
-      ActiveRecord::Schema.define do
-        drop_table model
-      end if model.table_exists?
-    rescue
-    end
-  end and true
-end
-
-# Drop all indices of models registered as subclasses of ActiveRecord::Base.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def delete_all_indices!
-  client = Elasticsearch::Model.client
-  ActiveRecord::Base.descendants.each do |model|
-    begin
-      client.indices.delete(index: model.index_name) if model.__elasticsearch__.index_exists?
-    rescue
-    end
-  end and true
-end
-
-# Remove all classes.
-#
-# @param [ Array<Class> ] classes The list of classes to remove.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def remove_classes(*classes)
-  classes.each do |_class|
-    Object.send(:remove_const, _class.name.to_sym) if defined?(_class)
-  end and true
-end
-
-# Determine whether the tests with Mongoid should be run.
-# Depends on whether MongoDB is running on the default host and port, `localhost:27017`.
-#
-# @return [ true, false ]
-#
-# @since 6.0.1
-def test_mongoid?
-  $mongoid_available ||= begin
-    require 'mongoid'
-    if defined?(Mongo) # older versions of Mongoid use the driver, Moped
-      client = Mongo::Client.new(['localhost:27017'])
-      Timeout.timeout(1) do
-        client.database.command(ping: 1) && true
-      end
-    end and true
-  rescue Timeout::Error, LoadError, Mongo::Error => e
-    client.close
-    $stderr.puts("MongoDB not installed or running: #{e}")
-  end
-end
-
-# Connect Mongoid and set up its Logger if Mongoid tests should be run.
-#
-# @since 6.0.1
-def connect_mongoid(source)
-  if test_mongoid?
-    $stderr.puts "Mongoid #{Mongoid::VERSION}", '-'*80
-
-    if !ENV['QUIET'] == 'true'
-      logger = ::Logger.new($stderr)
-      logger.formatter = lambda { |s, d, p, m| " #{m.ansi(:faint, :cyan)}\n" }
-      logger.level = ::Logger::DEBUG
-      Mongoid.logger = logger
-      Mongo::Logger.logger = logger
-    else
-      Mongo::Logger.logger.level = ::Logger::WARN
-    end
-
-    Mongoid.connect_to(source)
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app.rb
deleted file mode 100644
index c06ca9ca57..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'active_record'
-
-require 'support/app/question'
-require 'support/app/answer'
-require 'support/app/parent_and_child_searchable'
-require 'support/app/article_with_custom_serialization'
-require 'support/app/import_article'
-require 'support/app/namespaced_book'
-require 'support/app/article_for_pagination'
-require 'support/app/article_with_dynamic_index_name'
-require 'support/app/episode'
-require 'support/app/image'
-require 'support/app/series'
-require 'support/app/mongoid_article'
-require 'support/app/article'
-require 'support/app/searchable'
-require 'support/app/category'
-require 'support/app/author'
-require 'support/app/authorship'
-require 'support/app/comment'
-require 'support/app/post'
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/answer.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/answer.rb
deleted file mode 100644
index 7de32dc7b7..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/answer.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-class Answer < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  belongs_to :question
-
-  JOIN_TYPE = 'answer'.freeze
-
-  index_name 'questions_and_answers'.freeze
-  document_type 'doc'.freeze
-
-  before_create :randomize_id
-
-  def randomize_id
-    begin
-      self.id = SecureRandom.random_number(1_000_000)
-    end while Answer.where(id: self.id).exists?
-  end
-
-  mapping do
-    indexes :text
-    indexes :author
-  end
-
-  def as_indexed_json(options={})
-    # This line is necessary for differences between ActiveModel::Serializers::JSON#as_json versions
-    json = as_json(options)[JOIN_TYPE] || as_json(options)
-    json.merge(join_field: { name: JOIN_TYPE, parent: question_id })
-  end
-
-  after_commit lambda { __elasticsearch__.index_document(routing: (question_id || 1))  },  on: :create
-  after_commit lambda { __elasticsearch__.update_document(routing: (question_id || 1)) },  on: :update
-  after_commit lambda {__elasticsearch__.delete_document(routing: (question_id || 1)) },  on: :destroy
-end
\ No newline at end of file
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/article.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/article.rb
deleted file mode 100644
index ddff706ef2..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/article.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class ::Article < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  document_type 'article'
-
-  settings index: {number_of_shards: 1, number_of_replicas: 0} do
-    mapping do
-      indexes :title, type: 'text', analyzer: 'snowball'
-      indexes :body, type: 'text'
-      indexes :clicks, type: 'integer'
-      indexes :created_at, type: 'date'
-    end
-  end
-
-  def as_indexed_json(options = {})
-    attributes
-        .symbolize_keys
-        .slice(:title, :body, :clicks, :created_at)
-        .merge(suggest_title: title)
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_for_pagination.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/article_for_pagination.rb
deleted file mode 100644
index 8bea633c1e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_for_pagination.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class ::ArticleForPagination < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  scope :published, -> { where(published: true) }
-
-  settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-    mapping do
-      indexes :title,      type: 'text', analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_custom_serialization.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_custom_serialization.rb
deleted file mode 100644
index c03b19ea5a..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_custom_serialization.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class ::ArticleWithCustomSerialization < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  mapping do
-    indexes :title
-  end
-
-  def as_indexed_json(options={})
-    # as_json(options.merge root: false).slice('title')
-    { title: self.title }
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_dynamic_index_name.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_dynamic_index_name.rb
deleted file mode 100644
index 7c53d04bf0..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/article_with_dynamic_index_name.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class ::ArticleWithDynamicIndexName < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  def self.counter=(value)
-    @counter = 0
-  end
-
-  def self.counter
-    (@counter ||= 0) && @counter += 1
-  end
-
-  mapping    { indexes :title }
-  index_name { "articles-#{counter}" }
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/author.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/author.rb
deleted file mode 100644
index ff1664af7d..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/author.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Author < ActiveRecord::Base
-  has_many :authorships
-
-  after_update { self.authorships.each(&:touch) }
-
-  def full_name
-    [first_name, last_name].compact.join(' ')
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/authorship.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/authorship.rb
deleted file mode 100644
index 70bc2458fa..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/authorship.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Authorship < ActiveRecord::Base
-  belongs_to :author
-  belongs_to :post, touch: true
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/category.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/category.rb
deleted file mode 100644
index 751413c0db..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/category.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Category < ActiveRecord::Base
-  has_and_belongs_to_many :posts
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/comment.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/comment.rb
deleted file mode 100644
index 49a25832cd..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/comment.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Comment < ActiveRecord::Base
-  belongs_to :post, touch: true
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/episode.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/episode.rb
deleted file mode 100644
index 6cd159c265..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/episode.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Episode < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  settings index: {number_of_shards: 1, number_of_replicas: 0} do
-    mapping do
-      indexes :name, type: 'text', analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/image.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/image.rb
deleted file mode 100644
index 8bddcd08bf..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/image.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Image
-  include Mongoid::Document
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  field :name, type: String
-  attr_accessible :name if respond_to? :attr_accessible
-
-  settings index: {number_of_shards: 1, number_of_replicas: 0} do
-    mapping do
-      indexes :name, type: 'text', analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-    end
-  end
-
-  def as_indexed_json(options={})
-    as_json(except: [:_id])
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/import_article.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/import_article.rb
deleted file mode 100644
index d255807866..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/import_article.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class ImportArticle < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  scope :popular, -> { where('views >= 5') }
-
-  mapping do
-    indexes :title,      type: 'text'
-    indexes :views,      type: 'integer'
-    indexes :numeric,    type: 'integer'
-    indexes :created_at, type: 'date'
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/mongoid_article.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/mongoid_article.rb
deleted file mode 100644
index cf3a67a846..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/mongoid_article.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class ::MongoidArticle
-  include Mongoid::Document
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  field :id, type: String
-  field :title, type: String
-  field :views, type: Integer
-  attr_accessible :title if respond_to? :attr_accessible
-
-  settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-    mapping do
-      indexes :title,      type: 'text', analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-    end
-  end
-
-  def as_indexed_json(options={})
-    as_json(except: [:id, :_id])
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/namespaced_book.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/namespaced_book.rb
deleted file mode 100644
index 07a500928e..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/namespaced_book.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module MyNamespace
-  class Book < ActiveRecord::Base
-    include Elasticsearch::Model
-    include Elasticsearch::Model::Callbacks
-
-    document_type 'book'
-
-    mapping { indexes :title }
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/parent_and_child_searchable.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/parent_and_child_searchable.rb
deleted file mode 100644
index fd2f4417ac..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/parent_and_child_searchable.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module ParentChildSearchable
-  INDEX_NAME = 'questions_and_answers'.freeze
-  JOIN = 'join'.freeze
-
-  def create_index!(options={})
-    client = Question.__elasticsearch__.client
-    client.indices.delete index: INDEX_NAME rescue nil if options[:force]
-
-    settings = Question.settings.to_hash.merge Answer.settings.to_hash
-    mapping_properties = { join_field: { type: JOIN,
-                                         relations: { Question::JOIN_TYPE => Answer::JOIN_TYPE } } }
-
-    merged_properties = mapping_properties.merge(Question.mappings.to_hash[:doc][:properties]).merge(
-        Answer.mappings.to_hash[:doc][:properties])
-    mappings = { doc: { properties: merged_properties }}
-
-    client.indices.create index: INDEX_NAME,
-                          body: {
-                              settings: settings.to_hash,
-                              mappings: mappings }
-  end
-
-  extend self
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/post.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/post.rb
deleted file mode 100644
index 0cdbba7bb3..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/post.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Post < ActiveRecord::Base
-  include Searchable
-
-  has_and_belongs_to_many :categories, after_add:    [ lambda { |a,c| a.__elasticsearch__.index_document } ],
-                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
-  has_many                :authorships
-  has_many                :authors, through: :authorships,
-                          after_add: [ lambda { |a,c| a.__elasticsearch__.index_document } ],
-                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
-  has_many                :comments, after_add:    [ lambda { |a,c| a.__elasticsearch__.index_document } ],
-                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
-
-  after_touch() { __elasticsearch__.index_document }
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/question.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/question.rb
deleted file mode 100644
index f64a97a929..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/question.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class Question < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  has_many :answers, dependent: :destroy
-
-  JOIN_TYPE = 'question'.freeze
-  JOIN_METADATA = { join_field: JOIN_TYPE}.freeze
-
-  index_name 'questions_and_answers'.freeze
-  document_type 'doc'.freeze
-
-  mapping do
-    indexes :title
-    indexes :text
-    indexes :author
-  end
-
-  def as_indexed_json(options={})
-    # This line is necessary for differences between ActiveModel::Serializers::JSON#as_json versions
-    json = as_json(options)[JOIN_TYPE] || as_json(options)
-    json.merge(JOIN_METADATA)
-  end
-
-  after_commit lambda { __elasticsearch__.index_document  },  on: :create
-  after_commit lambda { __elasticsearch__.update_document },  on: :update
-  after_commit lambda { __elasticsearch__.delete_document },  on: :destroy
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/searchable.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/searchable.rb
deleted file mode 100644
index 826a648753..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/searchable.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module Searchable
-  extend ActiveSupport::Concern
-
-  included do
-    include Elasticsearch::Model
-    include Elasticsearch::Model::Callbacks
-
-    # Set up the mapping
-    #
-    settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-      mapping do
-        indexes :title,      analyzer: 'snowball'
-        indexes :created_at, type: 'date'
-
-        indexes :authors do
-          indexes :first_name
-          indexes :last_name
-            indexes :full_name, type: 'text' do
-            indexes :raw, type: 'keyword'
-          end
-        end
-
-        indexes :categories, type: 'keyword'
-
-        indexes :comments, type: 'nested' do
-          indexes :text
-          indexes :author
-        end
-      end
-    end
-
-    # Customize the JSON serialization for Elasticsearch
-    #
-    def as_indexed_json(options={})
-      {
-          title: title,
-          text:  text,
-          categories: categories.map(&:title),
-          authors:    authors.as_json(methods: [:full_name], only: [:full_name, :first_name, :last_name]),
-          comments:   comments.as_json(only: [:text, :author])
-      }
-    end
-
-    # Update document in the index after touch
-    #
-    after_touch() { __elasticsearch__.index_document }
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/app/series.rb b/elasticsearch-rails/elasticsearch-model/spec/support/app/series.rb
deleted file mode 100644
index d10a047488..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/app/series.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Series < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  settings index: {number_of_shards: 1, number_of_replicas: 0} do
-    mapping do
-      indexes :name, type: 'text', analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/model.json b/elasticsearch-rails/elasticsearch-model/spec/support/model.json
deleted file mode 100644
index 0c3e4a3887..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/model.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "laz": "qux" }
diff --git a/elasticsearch-rails/elasticsearch-model/spec/support/model.yml b/elasticsearch-rails/elasticsearch-model/spec/support/model.yml
deleted file mode 100644
index ba8ca60f34..0000000000
--- a/elasticsearch-rails/elasticsearch-model/spec/support/model.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-baz:
-  'qux'
diff --git a/elasticsearch-rails/elasticsearch-rails/.gitignore b/elasticsearch-rails/elasticsearch-rails/.gitignore
deleted file mode 100644
index d87d4be66f..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
diff --git a/elasticsearch-rails/elasticsearch-rails/CHANGELOG.md b/elasticsearch-rails/elasticsearch-rails/CHANGELOG.md
deleted file mode 100644
index 5bb4e13bd3..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/CHANGELOG.md
+++ /dev/null
@@ -1,44 +0,0 @@
-## 0.1.9
-
-* Added checks for proper launch order and other updates to the example application templates
-* Updated the example application to work with Elasticsearch 2.x
-* Used the `suggest` method instead of `response['suggest']` in the application template
-
-## 0.1.8
-
-* Added an example application template that loads settings from a file
-* Added missing require in the seeds.rb file for the expert template
-* Fixed double include of the aliased method (execute_without_instrumentation)
-* Fixed the error when getting the search_controller_test.rb asset in `03-expert.rb` template
-* Updated URLs for getting raw assets from Github in the `03-expert.rb` template
-
-## 0.1.7
-
-* Updated dependencies for the gem and example applications
-* Fixed various small errors in the `01-basic.rb` template
-* Fixed error when inserting the Kaminari gem into Gemfile in the 02-pretty.rb template
-* Fixed incorrect regex for adding Rails instrumentation into the application.rb in the `02-pretty.rb` template
-* Fixed other small errors in the `02-pretty.rb` template
-* Improved and added tests for the generated application from the `02-pretty.rb` template
-* Added the `04-dsl.rb` template which uses the `elasticsearch-dsl` gem to build the search definition
-
-## 0.1.6
-
-* Fixed errors in templates for the Rails example applications
-* Fixed errors in the importing Rake task
-* Refactored and updated the instrumentation support to allow integration with `Persistence::Model`
-
-## 0.1.5
-
-* Fixed an exception when no suggestions were returned in the `03-expert` example application template
-
-## 0.1.2
-
-* Allow passing an ActiveRecord scope to the importing Rake task
-
-## 0.1.1
-
-* Improved the Rake tasks
-* Improved the example application templates
-
-## 0.1.0 (Initial Version)
diff --git a/elasticsearch-rails/elasticsearch-rails/Gemfile b/elasticsearch-rails/elasticsearch-rails/Gemfile
deleted file mode 100644
index 407f94341d..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/Gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in elasticsearch-rails.gemspec
-gemspec
-
-gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
-gem 'elasticsearch-persistence', :path => File.expand_path("../../elasticsearch-persistence", __FILE__), :require => false
-
-
-group :development, :testing do
-  gem 'rspec'
-  gem 'pry-nav'
-  gem 'sqlite3' unless defined?(JRUBY_VERSION)
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/LICENSE.txt b/elasticsearch-rails/elasticsearch-rails/LICENSE.txt
deleted file mode 100644
index 7dc94b3e5a..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/LICENSE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2014 Elasticsearch
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/elasticsearch-rails/elasticsearch-rails/README.md b/elasticsearch-rails/elasticsearch-rails/README.md
deleted file mode 100644
index dcfc1cdf6d..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/README.md
+++ /dev/null
@@ -1,145 +0,0 @@
-# Elasticsearch::Rails
-
-The `elasticsearch-rails` library is a companion for the
-the [`elasticsearch-model`](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model)
-library, providing features suitable for Ruby on Rails applications.
-
-## Compatibility
-
-This library is compatible with Ruby 1.9.3 and higher.
-
-The library version numbers follow the Elasticsearch major versions, and the `master` branch
-is compatible with the Elasticsearch `master` branch, therefore, with the next major version.
-
-| Rubygem       |   | Elasticsearch |
-|:-------------:|:-:| :-----------: |
-| 0.1           | → | 1.x           |
-| 2.x           | → | 2.x           |
-| 5.x           | → | 5.x           |
-| 6.x           | → | 6.x           |
-| master        | → | master        |
-
-## Installation
-
-Install the package from [Rubygems](https://rubygems.org):
-
-    gem install elasticsearch-rails
-
-To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://bundler.io):
-
-    gem 'elasticsearch-rails', git: 'git://github.com/elastic/elasticsearch-rails.git', branch: '5.x'
-
-or install it from a source code checkout:
-
-    git clone https://github.com/elastic/elasticsearch-rails.git
-    cd elasticsearch-rails/elasticsearch-rails
-    bundle install
-    rake install
-
-## Features
-
-### Rake Tasks
-
-To facilitate importing data from your models into Elasticsearch, require the task definition in your application,
-eg. in the `lib/tasks/elasticsearch.rake` file:
-
-```ruby
-require 'elasticsearch/rails/tasks/import'
-```
-
-To import the records from your `Article` model, run:
-
-```bash
-$ bundle exec rake environment elasticsearch:import:model CLASS='Article'
-```
-
-To limit the imported records to a certain
-ActiveRecord [scope](http://guides.rubyonrails.org/active_record_querying.html#scopes),
-pass it to the task:
-
-```bash
-$ bundle exec rake environment elasticsearch:import:model CLASS='Article' SCOPE='published'
-```
-
-Run this command to display usage instructions:
-
-```bash
-$ bundle exec rake -D elasticsearch
-```
-
-### ActiveSupport Instrumentation
-
-To display information about the search request (duration, search definition) during development,
-and to include the information in the Rails log file, require the component in your `application.rb` file:
-
-```ruby
-require 'elasticsearch/rails/instrumentation'
-```
-
-You should see an output like this in your application log in development environment:
-
-    Article Search (321.3ms) { index: "articles", type: "article", body: { query: ... } }
-
-Also, the total duration of the request to Elasticsearch is displayed in the Rails request breakdown:
-
-    Completed 200 OK in 615ms (Views: 230.9ms | ActiveRecord: 0.0ms | Elasticsearch: 321.3ms)
-
-There's a special component for the [Lograge](https://github.com/roidrage/lograge) logger.
-Require the component in your `application.rb` file (and set `config.lograge.enabled`):
-
-```ruby
-require 'elasticsearch/rails/lograge'
-```
-
-You should see the duration of the request to Elasticsearch as part of each log event:
-
-    method=GET path=/search ... status=200 duration=380.89 view=99.64 db=0.00 es=279.37
-
-### Rails Application Templates
-
-You can generate a fully working example Ruby on Rails application, with an `Article` model and a search form,
-to play with (it even downloads _Elasticsearch_ itself, generates the application skeleton and leaves you with
-a _Git_ repository to explore the steps and the code) with the
-[`01-basic.rb`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/01-basic.rb) template:
-
-```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/01-basic.rb
-```
-
-Run the same command again, in the same folder, with the
-[`02-pretty`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb)
-template to add features such as a custom `Article.search` method, result highlighting and
-[_Bootstrap_](http://getbootstrap.com) integration:
-
-```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb
-```
-
-Run the same command with the [`03-expert.rb`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/03-expert.rb)
-template to refactor the application into a more complex use case,
-with couple of hundreds of The New York Times articles as the example content.
-The template will extract the Elasticsearch integration into a `Searchable` "concern" module,
-define complex mapping, custom serialization, implement faceted navigation and suggestions as a part of
-a complex query, and add a _Sidekiq_-based worker for updating the index in the background.
-
-```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
-```
-
-## License
-
-This software is licensed under the Apache 2 license, quoted below.
-
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/elasticsearch-rails/elasticsearch-rails/Rakefile b/elasticsearch-rails/elasticsearch-rails/Rakefile
deleted file mode 100644
index 0d87185d4d..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/Rakefile
+++ /dev/null
@@ -1,49 +0,0 @@
-require "bundler/gem_tasks"
-
-desc "Run unit tests"
-task :default => 'test:unit'
-task :test    => 'test:unit'
-
-# ----- Test tasks ------------------------------------------------------------
-
-require 'rake/testtask'
-require 'rspec/core/rake_task'
-
-namespace :test do
-
-  RSpec::Core::RakeTask.new(:spec)
-
-  Rake::TestTask.new(:all) do |test|
-    test.verbose = false
-    test.warning = false
-    test.deps = [ :spec ] unless defined?(JRUBY_VERSION)
-  end
-end
-
-namespace :bundle do
-  desc 'Install gem dependencies'
-  task :install do
-    puts '-'*80
-    Bundler.with_clean_env do
-      sh 'bundle install'
-    end
-    puts '-'*80
-  end
-end
-
-# ----- Documentation tasks ---------------------------------------------------
-
-require 'yard'
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.options = %w| --embed-mixins --markup=markdown |
-end
-
-# ----- Code analysis tasks ---------------------------------------------------
-
-if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-  require 'cane/rake_task'
-  Cane::RakeTask.new(:quality) do |cane|
-    cane.abc_max = 15
-    cane.no_style = true
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/elasticsearch-rails.gemspec b/elasticsearch-rails/elasticsearch-rails/elasticsearch-rails.gemspec
deleted file mode 100644
index 744d2fcb44..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/elasticsearch-rails.gemspec
+++ /dev/null
@@ -1,48 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'elasticsearch/rails/version'
-
-Gem::Specification.new do |s|
-  s.name          = "elasticsearch-rails"
-  s.version       = Elasticsearch::Rails::VERSION
-  s.authors       = ["Karel Minarik"]
-  s.email         = ["karel.minarik@elasticsearch.org"]
-  s.description   = "Ruby on Rails integrations for Elasticsearch."
-  s.summary       = "Ruby on Rails integrations for Elasticsearch."
-  s.homepage      = "https://github.com/elasticsearch/elasticsearch-rails/"
-  s.license       = "Apache 2"
-
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
-  s.rdoc_options      = [ "--charset=UTF-8" ]
-
-  s.required_ruby_version = ">= 1.9.3"
-
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 11.1"
-
-  s.add_development_dependency "elasticsearch-extensions"
-
-  s.add_development_dependency "rails",  ">= 3.1"
-
-  s.add_development_dependency "lograge"
-
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda-context"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "pry"
-
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "cane"
-  s.add_development_dependency "require-prof"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails.rb
deleted file mode 100644
index f425f72763..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "elasticsearch/rails/version"
-
-module Elasticsearch
-  module Rails
-    # Your code goes here...
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation.rb
deleted file mode 100644
index 081791ab55..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'elasticsearch/rails/instrumentation/railtie'
-require 'elasticsearch/rails/instrumentation/publishers'
-
-module Elasticsearch
-  module Rails
-
-    # This module adds support for displaying statistics about search duration in the Rails application log
-    # by integrating with the `ActiveSupport::Notifications` framework and `ActionController` logger.
-    #
-    # == Usage
-    #
-    # Require the component in your `application.rb` file:
-    #
-    #     require 'elasticsearch/rails/instrumentation'
-    #
-    # You should see an output like this in your application log in development environment:
-    #
-    #     Article Search (321.3ms) { index: "articles", type: "article", body: { query: ... } }
-    #
-    # Also, the total duration of the request to Elasticsearch is displayed in the Rails request breakdown:
-    #
-    #     Completed 200 OK in 615ms (Views: 230.9ms | ActiveRecord: 0.0ms | Elasticsearch: 321.3ms)
-    #
-    # @note The displayed duration includes the HTTP transfer -- the time it took Elasticsearch
-    #       to process your request is available in the `response.took` property.
-    #
-    # @see Elasticsearch::Rails::Instrumentation::Publishers
-    # @see Elasticsearch::Rails::Instrumentation::Railtie
-    #
-    # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
-    #
-    #
-    module Instrumentation
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/controller_runtime.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/controller_runtime.rb
deleted file mode 100644
index 461387c808..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/controller_runtime.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'active_support/core_ext/module/attr_internal'
-
-module Elasticsearch
-  module Rails
-    module Instrumentation
-
-      # Hooks into ActionController to display Elasticsearch runtime
-      #
-      # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/railties/controller_runtime.rb
-      #
-      module ControllerRuntime
-        extend ActiveSupport::Concern
-
-        protected
-
-        attr_internal :elasticsearch_runtime
-
-        def cleanup_view_runtime
-          elasticsearch_rt_before_render = Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
-          runtime = super
-          elasticsearch_rt_after_render = Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
-          self.elasticsearch_runtime = elasticsearch_rt_before_render + elasticsearch_rt_after_render
-          runtime - elasticsearch_rt_after_render
-        end
-
-        def append_info_to_payload(payload)
-          super
-          payload[:elasticsearch_runtime] = (elasticsearch_runtime || 0) + Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
-        end
-
-        module ClassMethods
-          def log_process_action(payload)
-            messages, elasticsearch_runtime = super, payload[:elasticsearch_runtime]
-            messages << ("Elasticsearch: %.1fms" % elasticsearch_runtime.to_f) if elasticsearch_runtime
-            messages
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/log_subscriber.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/log_subscriber.rb
deleted file mode 100644
index c02bc07049..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/log_subscriber.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module Elasticsearch
-  module Rails
-    module Instrumentation
-
-      # A log subscriber to attach to Elasticsearch related events
-      #
-      # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
-      #
-      class LogSubscriber < ActiveSupport::LogSubscriber
-        def self.runtime=(value)
-          Thread.current["elasticsearch_runtime"] = value
-        end
-
-        def self.runtime
-          Thread.current["elasticsearch_runtime"] ||= 0
-        end
-
-        def self.reset_runtime
-          rt, self.runtime = runtime, 0
-          rt
-        end
-
-        # Intercept `search.elasticsearch` events, and display them in the Rails log
-        #
-        def search(event)
-          self.class.runtime += event.duration
-          return unless logger.debug?
-
-          payload = event.payload
-          name    = "#{payload[:klass]} #{payload[:name]} (#{event.duration.round(1)}ms)"
-          search  = payload[:search].inspect.gsub(/:(\w+)=>/, '\1: ')
-
-          debug %Q|  #{color(name, GREEN, true)} #{colorize_logging ? "\e[2m#{search}\e[0m" : search}|
-        end
-      end
-
-    end
-  end
-end
-
-Elasticsearch::Rails::Instrumentation::LogSubscriber.attach_to :elasticsearch
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/publishers.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/publishers.rb
deleted file mode 100644
index e054d53712..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/publishers.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module Elasticsearch
-  module Rails
-    module Instrumentation
-      module Publishers
-
-        # Wraps the `SearchRequest` methods to perform the instrumentation
-        #
-        # @see SearchRequest#execute_with_instrumentation!
-        # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
-        #
-        module SearchRequest
-
-          def self.included(base)
-            base.class_eval do
-              unless method_defined?(:execute_without_instrumentation!)
-                alias_method :execute_without_instrumentation!, :execute!
-                alias_method :execute!, :execute_with_instrumentation!
-              end
-            end
-          end
-
-          # Wrap `Search#execute!` and perform instrumentation
-          #
-          def execute_with_instrumentation!
-            ActiveSupport::Notifications.instrument "search.elasticsearch",
-              name:   'Search',
-              klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
-              search: self.definition do
-              execute_without_instrumentation!
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/railtie.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/railtie.rb
deleted file mode 100644
index 6aeb6a866d..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/instrumentation/railtie.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module Elasticsearch
-  module Rails
-    module Instrumentation
-
-      # Rails initializer class to require Elasticsearch::Rails::Instrumentation files,
-      # set up Elasticsearch::Model and hook into ActionController to display Elasticsearch-related duration
-      #
-      # @see http://edgeguides.rubyonrails.org/active_support_instrumentation.html
-      #
-      class Railtie < ::Rails::Railtie
-        initializer "elasticsearch.instrumentation" do |app|
-          require 'elasticsearch/rails/instrumentation/log_subscriber'
-          require 'elasticsearch/rails/instrumentation/controller_runtime'
-
-          Elasticsearch::Model::Searching::SearchRequest.class_eval do
-            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
-          end if defined?(Elasticsearch::Model::Searching::SearchRequest)
-
-          ActiveSupport.on_load(:action_controller) do
-            include Elasticsearch::Rails::Instrumentation::ControllerRuntime
-          end
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/lograge.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/lograge.rb
deleted file mode 100644
index aa0f4f1f30..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/lograge.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Elasticsearch
-  module Rails
-    module Lograge
-
-      # Rails initializer class to require Elasticsearch::Rails::Instrumentation files,
-      # set up Elasticsearch::Model and add Lograge configuration to display Elasticsearch-related duration
-      #
-      # Require the component in your `application.rb` file and enable Lograge:
-      #
-      #     require 'elasticsearch/rails/lograge'
-      #
-      # You should see the full duration of the request to Elasticsearch as part of each log event:
-      #
-      #     method=GET path=/search ... status=200 duration=380.89 view=99.64 db=0.00 es=279.37
-      #
-      # @see https://github.com/roidrage/lograge
-      #
-      class Railtie < ::Rails::Railtie
-        initializer "elasticsearch.lograge" do |app|
-          require 'elasticsearch/rails/instrumentation/publishers'
-          require 'elasticsearch/rails/instrumentation/log_subscriber'
-          require 'elasticsearch/rails/instrumentation/controller_runtime'
-
-          Elasticsearch::Model::Searching::SearchRequest.class_eval do
-            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
-          end if defined?(Elasticsearch::Model::Searching::SearchRequest)
-
-          ActiveSupport.on_load(:action_controller) do
-            include Elasticsearch::Rails::Instrumentation::ControllerRuntime
-          end
-
-          config.lograge.custom_options = lambda do |event|
-            { es: event.payload[:elasticsearch_runtime].to_f.round(2) }
-          end
-        end
-      end
-
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/tasks/import.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/tasks/import.rb
deleted file mode 100644
index 9b0fa2039e..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/tasks/import.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# A collection of Rake tasks to facilitate importing data from your models into Elasticsearch.
-#
-# Add this e.g. into the `lib/tasks/elasticsearch.rake` file in your Rails application:
-#
-#     require 'elasticsearch/rails/tasks/import'
-#
-# To import the records from your `Article` model, run:
-#
-#     $ bundle exec rake environment elasticsearch:import:model CLASS='MyModel'
-#
-# Run this command to display usage instructions:
-#
-#     $ bundle exec rake -D elasticsearch
-#
-STDOUT.sync = true
-STDERR.sync = true
-
-begin; require 'ansi/progressbar'; rescue LoadError; end
-
-namespace :elasticsearch do
-
-  task :import => 'import:model'
-
-  namespace :import do
-    import_model_desc = <<-DESC.gsub(/    /, '')
-      Import data from your model (pass name as CLASS environment variable).
-
-        $ rake environment elasticsearch:import:model CLASS='MyModel'
-
-      Force rebuilding the index (delete and create):
-        $ rake environment elasticsearch:import:model CLASS='Article' FORCE=y
-
-      Customize the batch size:
-        $ rake environment elasticsearch:import:model CLASS='Article' BATCH=100
-
-      Set target index name:
-        $ rake environment elasticsearch:import:model CLASS='Article' INDEX='articles-new'
-
-      Pass an ActiveRecord scope to limit the imported records:
-        $ rake environment elasticsearch:import:model CLASS='Article' SCOPE='published'
-    DESC
-    desc import_model_desc
-    task :model do
-      if ENV['CLASS'].to_s == ''
-        puts '='*90, 'USAGE', '='*90, import_model_desc, ""
-        exit(1)
-      end
-
-      klass  = eval(ENV['CLASS'].to_s)
-      total  = klass.count rescue nil
-      pbar   = ANSI::Progressbar.new(klass.to_s, total) rescue nil
-      pbar.__send__ :show if pbar
-
-      unless ENV['DEBUG']
-        begin
-          klass.__elasticsearch__.client.transport.logger.level = Logger::WARN
-        rescue NoMethodError; end
-        begin
-          klass.__elasticsearch__.client.transport.tracer.level = Logger::WARN
-        rescue NoMethodError; end
-      end
-
-      total_errors = klass.__elasticsearch__.import force:      ENV.fetch('FORCE', false),
-                                  batch_size: ENV.fetch('BATCH', 1000).to_i,
-                                  index:      ENV.fetch('INDEX', nil),
-                                  type:       ENV.fetch('TYPE',  nil),
-                                  scope:      ENV.fetch('SCOPE', nil) do |response|
-        pbar.inc response['items'].size if pbar
-        STDERR.flush
-        STDOUT.flush
-      end
-      pbar.finish if pbar
-
-      puts "[IMPORT] #{total_errors} errors occurred" unless total_errors.zero?
-      puts '[IMPORT] Done'
-    end
-
-    desc <<-DESC.gsub(/    /, '')
-      Import all indices from `app/models` (or use DIR environment variable).
-
-        $ rake environment elasticsearch:import:all DIR=app/models
-    DESC
-    task :all do
-      dir    = ENV['DIR'].to_s != '' ? ENV['DIR'] : Rails.root.join("app/models")
-
-      puts "[IMPORT] Loading models from: #{dir}"
-      Dir.glob(File.join("#{dir}/**/*.rb")).each do |path|
-        model_filename = path[/#{Regexp.escape(dir.to_s)}\/([^\.]+).rb/, 1]
-
-        next if model_filename.match(/^concerns\//i) # Skip concerns/ folder
-
-        begin
-          klass = model_filename.camelize.constantize
-        rescue NameError
-          require(path) ? retry : raise(RuntimeError, "Cannot load class '#{klass}'")
-        end
-
-        # Skip if the class doesn't have Elasticsearch integration
-        next unless klass.respond_to?(:__elasticsearch__)
-
-        puts "[IMPORT] Processing model: #{klass}..."
-
-        ENV['CLASS'] = klass.to_s
-        Rake::Task["elasticsearch:import:model"].invoke
-        Rake::Task["elasticsearch:import:model"].reenable
-        puts
-      end
-    end
-
-  end
-
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/version.rb b/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/version.rb
deleted file mode 100644
index 2e73a64ef3..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/elasticsearch/rails/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Elasticsearch
-  module Rails
-    VERSION = '6.1.0'
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/01-basic.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/01-basic.rb
deleted file mode 100644
index 5e96375446..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/01-basic.rb
+++ /dev/null
@@ -1,343 +0,0 @@
-# =====================================================================================================
-# Template for generating a no-frills Rails application with support for Elasticsearch full-text search
-# =====================================================================================================
-#
-# This file creates a basic, fully working Rails application with support for Elasticsearch full-text
-# search via the `elasticsearch-rails` gem; https://github.com/elasticsearch/elasticsearch-rails.
-#
-# Requirements:
-# -------------
-#
-# * Git
-# * Ruby  >= 1.9.3
-# * Rails >= 5
-#
-# Usage:
-# ------
-#
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/01-basic.rb
-#
-# =====================================================================================================
-
-require 'uri'
-require 'net/http'
-require 'json'
-
-$elasticsearch_url = ENV.fetch('ELASTICSEARCH_URL', 'http://localhost:9200')
-
-# ----- Check for Elasticsearch -------------------------------------------------------------------
-
-required_elasticsearch_version = '6'
-
-docker_command =<<-CMD.gsub(/\s{1,}/, ' ').strip
-  docker run \
-    --name elasticsearch-rails-searchapp \
-    --publish 9200:9200 \
-    --env "discovery.type=single-node" \
-    --env "cluster.name=elasticsearch-rails" \
-    --env "cluster.routing.allocation.disk.threshold_enabled=false" \
-    --rm \
-    docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.0
-CMD
-
-begin
-  cluster_info = Net::HTTP.get(URI.parse($elasticsearch_url))
-rescue Errno::ECONNREFUSED => e
-  say_status "ERROR", "Cannot connect to Elasticsearch on <#{$elasticsearch_url}>\n\n", :red
-  say_status "", "The application requires an Elasticsearch cluster running, " +
-                 "but no cluster has been found on <#{$elasticsearch_url}>."
-  say_status "", "The easiest way of launching Elasticsearch is by running it with Docker (https://www.docker.com/get-docker):\n\n"
-  say_status "", docker_command + "\n"
-  exit(1)
-rescue StandardError => e
-  say_status "ERROR", "#{e.class}: #{e.message}", :red
-  exit(1)
-end
-
-cluster_info = JSON.parse(cluster_info)
-
-unless cluster_info['version']
-  say_status "ERROR", "Cannot determine Elasticsearch version from <#{$elasticsearch_url}>", :red
-  say_status "", JSON.dump(cluster_info), :red
-  exit(1)
-end
-
-if cluster_info['version']['number'] < required_elasticsearch_version
-  say_status "ERROR",
-             "The application requires Elasticsearch version #{required_elasticsearch_version} or higher, found version #{cluster_info['version']['number']}.\n\n", :red
-  say_status "", "The easiest way of launching Elasticsearch is by running it with Docker (https://www.docker.com/get-docker):\n\n"
-  say_status "", docker_command + "\n"
-  exit(1)
-end
-
-# ----- Application skeleton ----------------------------------------------------------------------
-
-run "touch tmp/.gitignore"
-
-append_to_file ".gitignore", "vendor/elasticsearch-5.2.1/\n"
-
-git :init
-git add:    "."
-git commit: "-m 'Initial commit: Clean application'"
-
-# ----- Add README --------------------------------------------------------------------------------
-
-puts
-say_status  "README", "Adding Readme...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-remove_file 'README.md'
-
-create_file 'README.md', <<-README
-# Ruby on Rails and Elasticsearch: Example application
-
-This application is an example of integrating the {Elasticsearch}[http://www.elasticsearch.org]
-search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
-
-It has been generated by application templates available at
-https://github.com/elasticsearch/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates.
-
-## [1] Basic
-
-The `basic` version provides a simple integration for a simple Rails model, `Article`, showing how
-to include the search engine support in your model, automatically index changes to records,
-and use a form to perform simple search require 'requests.'
-
-README
-
-
-git add:    "."
-git commit: "-m '[01] Added README for the application'"
-
-# ----- Use Thin ----------------------------------------------------------------------------------
-
-begin
-  require 'thin'
-  puts
-  say_status  "Rubygems", "Adding Thin into Gemfile...\n", :yellow
-  puts        '-'*80, '';
-
-  gem 'thin'
-rescue LoadError
-end
-
-# ----- Auxiliary gems ----------------------------------------------------------------------------
-
-gem 'mocha', group: 'test'
-gem 'rails-controller-testing', group: 'test'
-
-# ----- Remove CoffeeScript, Sass and "all that jazz" ---------------------------------------------
-
-comment_lines 'Gemfile', /gem 'coffee/
-comment_lines 'Gemfile', /gem 'sass/
-comment_lines 'Gemfile', /gem 'uglifier/
-uncomment_lines 'Gemfile', /gem 'therubyracer/
-
-# ----- Add gems into Gemfile ---------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Adding Elasticsearch libraries into Gemfile...\n", :yellow
-puts        '-'*80, ''; sleep 0.75
-
-gem 'elasticsearch',       git: 'https://github.com/elasticsearch/elasticsearch-ruby.git'
-gem 'elasticsearch-model', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
-gem 'elasticsearch-rails', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
-
-
-git add:    "Gemfile*"
-git commit: "-m 'Added libraries into Gemfile'"
-
-# ----- Disable asset logging in development ------------------------------------------------------
-
-puts
-say_status  "Application", "Disabling asset logging in development...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-environment 'config.assets.logger = false', env: 'development'
-environment 'config.assets.quiet  = true',  env: 'development'
-
-git add:    "config/"
-git commit: "-m 'Disabled asset logging in development'"
-
-# ----- Install gems ------------------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Installing Rubygems...", :yellow
-puts        '-'*80, ''
-
-run "bundle install"
-
-# ----- Generate Article resource -----------------------------------------------------------------
-
-puts
-say_status  "Model", "Generating the Article resource...", :yellow
-puts        '-'*80, ''; sleep 0.75
-
-generate :scaffold, "Article title:string content:text published_on:date"
-route "root to: 'articles#index'"
-rake  "db:migrate"
-
-git add:    "."
-git commit: "-m 'Added the generated Article resource'"
-
-# ----- Add Elasticsearch integration into the model ----------------------------------------------
-
-puts
-say_status  "Model", "Adding search support into the Article model...", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-run "rm -f app/models/article.rb"
-file 'app/models/article.rb', <<-CODE
-class Article < ActiveRecord::Base
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-  #{'attr_accessible :title, :content, :published_on' if Rails::VERSION::STRING < '4'}
-end
-CODE
-
-git commit: "-a -m 'Added Elasticsearch support into the Article model'"
-
-# ----- Add Elasticsearch integration into the interface ------------------------------------------
-
-puts
-say_status  "Controller", "Adding controller action, route, and HTML for searching...", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-inject_into_file 'app/controllers/articles_controller.rb', before: %r|^\s*# GET /articles/1$| do
-  <<-CODE
-
-  # GET /articles/search
-  def search
-    @articles = Article.search(params[:q]).records
-
-    render action: "index"
-  end
-
-  CODE
-end
-
-inject_into_file 'app/views/articles/index.html.erb', after: %r{<h1>.*Articles</h1>}i do
-  <<-CODE
-
-
-  <hr>
-
-  <%= form_tag search_articles_path, method: 'get' do %>
-    <%= label_tag :query %>
-    <%= text_field_tag :q, params[:q] %>
-    <%= submit_tag :search %>
-  <% end %>
-
-  <hr>
-  CODE
-end
-
-inject_into_file 'app/views/articles/index.html.erb', after: %r{<%= link_to 'New Article', new_article_path %>} do
-  <<-CODE
-  <%= link_to 'All Articles', articles_path if params[:q] %>
-  CODE
-end
-
-gsub_file 'config/routes.rb', %r{resources :articles$}, <<-CODE
-resources :articles do
-    collection { get :search }
-  end
-CODE
-
-gsub_file "test/controllers/articles_controller_test.rb", %r{setup do.*?end}m, <<-CODE
-setup do
-    @article = articles(:one)
-
-    Article.__elasticsearch__.import force: true
-    Article.__elasticsearch__.refresh_index!
-  end
-CODE
-
-inject_into_file "test/controllers/articles_controller_test.rb", after: %r{test "should get index" do.*?end}m do
-  <<-CODE
-
-
-  test "should get search results" do
-    #{ Rails::VERSION::STRING > '5' ? 'get search_articles_url(q: "mystring")' : 'get :search, q: "mystring"' }
-    assert_response :success
-    assert_not_nil assigns(:articles)
-    assert_equal 2, assigns(:articles).size
-  end
-  CODE
-end
-
-git commit: "-a -m 'Added search form and controller action'"
-
-# ----- Seed the database -------------------------------------------------------------------------
-
-puts
-say_status  "Database", "Seeding the database with data...", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-remove_file "db/seeds.rb"
-create_file 'db/seeds.rb', %q{
-contents = [
-'Lorem ipsum dolor sit amet.',
-'Consectetur adipisicing elit, sed do eiusmod tempor incididunt.',
-'Labore et dolore magna aliqua.',
-'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.',
-'Excepteur sint occaecat cupidatat non proident.'
-]
-
-puts "Deleting all articles..."
-Article.delete_all
-
-unless ENV['COUNT']
-
-  puts "Creating articles..."
-  %w[ One Two Three Four Five ].each_with_index do |title, i|
-    Article.create title: title, content: contents[i], published_on: i.days.ago.utc
-  end
-
-else
-
-  print "Generating articles..."
-  (1..ENV['COUNT'].to_i).each_with_index do |title, i|
-    Article.create title: "Title #{title}", content: 'Lorem ipsum dolor', published_on: i.days.ago.utc
-    print '.' if i % ENV['COUNT'].to_i/10 == 0
-  end
-  puts "\n"
-
-end
-}
-
-run  "rails runner 'Article.__elasticsearch__.create_index! force: true'"
-rake "db:seed"
-
-git add:    "db/seeds.rb"
-git commit: "-m 'Added the database seeding script'"
-
-# ----- Print Git log -----------------------------------------------------------------------------
-
-puts
-say_status  "Git", "Details about the application:", :yellow
-puts        '-'*80, ''
-
-git tag: "basic"
-git log: "--reverse --oneline"
-
-# ----- Start the application ---------------------------------------------------------------------
-
-unless ENV['RAILS_NO_SERVER_START']
-  require 'net/http'
-  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
-    puts        "\n"
-    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
-    puts        '-'*80
-
-    port = ask("Please provide free port:", :bold)
-  else
-    port = '3000'
-  end
-
-  puts  "", "="*80
-  say_status  "DONE", "\e[1mStarting the application.\e[0m", :yellow
-  puts  "="*80, ""
-
-  run  "rails server --port=#{port}"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/02-pretty.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/02-pretty.rb
deleted file mode 100644
index 2c33183041..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/02-pretty.rb
+++ /dev/null
@@ -1,331 +0,0 @@
-# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb
-
-unless File.read('README.md').include? '## [1] Basic'
-  say_status  "ERROR", "You have to run the 01-basic.rb template first.", :red
-  exit(1)
-end
-
-puts
-say_status  "README", "Updating Readme...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-append_to_file 'README.md', <<-README
-
-## [2] Pretty
-
-The `pretty` template builds on the `basic` version and brings couple of improvements:
-
-* Using the [Bootstrap](http://getbootstrap.com) framework to enhance the visual style of the application
-* Using an `Article.search` class method to customize the default search definition
-* Highlighting matching phrases in search results
-* Paginating results with Kaminari
-
-README
-
-git add:    "README.md"
-git commit: "-m '[02] Updated the application README'"
-
-# ----- Update application.rb ---------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Adding Rails logger integration...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-insert_into_file 'config/application.rb',
-                 "\n\nrequire 'elasticsearch/rails/instrumentation'",
-                 after: /Bundler\.require.+$/
-
-git add:    "config/application.rb"
-git commit: "-m 'Added the Rails logger integration to application.rb'"
-
-# ----- Add gems into Gemfile ---------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Adding Rubygems into Gemfile...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-# NOTE: Kaminari has to be loaded before Elasticsearch::Model so the callbacks are executed
-#
-insert_into_file 'Gemfile', <<-CODE, before: /gem ["']elasticsearch["'].+$/
-
-# NOTE: Kaminari has to be loaded before Elasticsearch::Model so the callbacks are executed
-gem 'kaminari'
-
-CODE
-
-run "bundle install"
-
-git add:    "Gemfile*"
-git commit: "-m 'Added the Kaminari gem'"
-
-# ----- Add `Article.search` class method ---------------------------------------------------------
-
-puts
-say_status  "Model", "Adding a `Article.search` class method...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-insert_into_file 'app/models/article.rb', <<-CODE, after: 'include Elasticsearch::Model::Callbacks'
-
-
-  def self.search(query)
-    __elasticsearch__.search(
-      {
-        query: {
-          multi_match: {
-            query: query,
-            fields: ['title^10', 'content']
-          }
-        },
-        highlight: {
-          pre_tags: ['<em class="label label-highlight">'],
-          post_tags: ['</em>'],
-          fields: {
-            title:   { number_of_fragments: 0 },
-            content: { fragment_size: 25 }
-          }
-        }
-      }
-    )
-  end
-CODE
-
-insert_into_file "#{Rails::VERSION::STRING > '4' ? 'test/models' : 'test/unit' }/article_test.rb", <<-CODE, after: /class ArticleTest < ActiveSupport::TestCase$/
-
-  teardown do
-    Article.__elasticsearch__.unstub(:search)
-  end
-
-CODE
-
-gsub_file "#{Rails::VERSION::STRING > '4' ? 'test/models' : 'test/unit' }/article_test.rb", %r{# test "the truth" do.*?# end}m, <<-CODE
-
-  test "has a search method delegating to __elasticsearch__" do
-    Article.__elasticsearch__.expects(:search).with do |definition|
-      assert_equal 'foo', definition[:query][:multi_match][:query]
-      true
-    end
-
-    Article.search 'foo'
-  end
-CODE
-
-insert_into_file "test/test_helper.rb",
-                 "require 'mocha/minitest'\n\n",
-                 before: "class ActiveSupport::TestCase\n"
-
-git add:    "app/models/article.rb"
-git add:    "test/**/article_test.rb"
-git add:    "test/test_helper.rb"
-git commit: "-m 'Added an `Article.search` method'"
-
-# ----- Add loading Bootstrap assets --------------------------------------------------------------
-
-puts
-say_status  "Bootstrap", "Adding Bootstrap asset links into the 'application' layout...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-gsub_file 'app/views/layouts/application.html.erb', %r{<%= yield %>}, <<-CODE unless File.read('app/views/layouts/application.html.erb').include?('class="container"')
-<div class="container">
-<%= yield %>
-</div>
-CODE
-
-insert_into_file 'app/views/layouts/application.html.erb', <<-CODE, before: '</head>'
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-CODE
-
-git commit: "-a -m 'Added loading Bootstrap assets in the application layout'"
-
-# ----- Customize the search form -----------------------------------------------------------------
-
-puts
-say_status  "Bootstrap", "Customizing the index page...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-gsub_file 'app/views/articles/index.html.erb', %r{<%= label_tag .* :search %>}m do |match|
-<<-CODE
-<div class="input-group">
-  <%= text_field_tag :q, params[:q], class: 'form-control', placeholder: 'Search...' %>
-</div>
-CODE
-end
-
-# ----- Customize the header -----------------------------------------------------------------
-
-gsub_file 'app/views/articles/index.html.erb', %r{<h1>.*Articles</h1>} do |match|
-  "<h1><%= controller.action_name == 'search' ? 'Search results' : 'Articles' %></h1>"
-end
-
-# ----- Customize the results listing -------------------------------------------------------------
-
-gsub_file 'app/views/articles/index.html.erb', %r{<table>} do |match|
-  '<table class="table table-hover">'
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<td><%= link_to [^%]+} do |match|
-  match.gsub!('<td>', '<td style="width: 50px">')
-  match.include?("btn") ? match : (match + ", class: 'btn btn-outline-primary btn-sm'")
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<br>\s*(<\%= link_to 'New Article'.*)}m do |content|
-  replace = content.match(%r{<br>\s*(<\%= link_to 'New Article'.*)}m)[1]
-  <<-END.gsub(/^  /, '')
-  <hr>
-
-  <p style="text-align: center; margin-bottom: 21px">
-    #{replace}
-  </p>
-  END
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<%= link_to 'New Article',\s*new_article_path} do |match|
-  return match if match.include?('btn')
-  match + ", class: 'btn btn-primary btn-xs', style: 'color: #fff'"
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<%= link_to 'All Articles',\s*articles_path} do |match|
-  return match if match.include?('btn')
-  "\n  " + match + ", class: 'btn btn-primary btn-xs', style: 'color: #fff'"
-end
-
-# ----- Customize the form -----------------------------------------------------------------
-
-gsub_file 'app/views/articles/_form.html.erb', %r{<div class="field">} do |match|
-  %Q|<div class="form-group">|
-end
-
-git add:    "app/views"
-git commit: "-m 'Refactored the articles listing to use Bootstrap components'"
-
-# ----- Use highlighted excerpts in the listing ---------------------------------------------------
-
-gsub_file 'app/views/articles/index.html.erb', %r{<% @articles.each do \|article\| %>$} do |match|
-  "<% @articles.__send__ controller.action_name == 'search' ? :each_with_hit : :each do |article, hit| %>"
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<td><%= article.title %></td>$} do |match|
-  "<td><%= hit.try(:highlight).try(:title)   ? hit.highlight.title.join.html_safe : article.title %></td>"
-end
-
-gsub_file 'app/views/articles/index.html.erb', %r{<td><%= article.content %></td>$} do |match|
-  "<td><%= hit.try(:highlight).try(:content) ? hit.highlight.content.join('&hellip;').html_safe : article.content %></td>"
-end
-
-git commit: "-a -m 'Added highlighting for matches'"
-
-# ----- Paginate the results ----------------------------------------------------------------------
-
-gsub_file 'app/controllers/articles_controller.rb', %r{@articles = Article.all} do |match|
-  "@articles = Article.page(params[:page])"
-end
-
-gsub_file 'app/controllers/articles_controller.rb', %r{@articles = Article.search\(params\[\:q\]\).records} do |match|
-  "@articles = Article.search(params[:q]).page(params[:page]).records"
-end
-
-insert_into_file 'app/views/articles/index.html.erb', after: '</table>' do
-  <<-CODE.gsub(/^  /, '')
-
-
-  <div class="text-center">
-    <%= paginate @articles %>
-  </div>
-  CODE
-end
-
-generate "kaminari:views", "bootstrap3", "--force"
-
-gsub_file 'app/views/kaminari/_paginator.html.erb', %r{<nav>}, '<nav class="pagination">'
-
-git add:    "."
-git commit: "-m 'Added pagination to articles listing'"
-
-# ----- Custom CSS --------------------------------------------------------------------------------
-
-puts
-say_status  "CSS", "Adding custom styles...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-append_to_file 'app/assets/stylesheets/application.css' do
-  unless File.read('app/assets/stylesheets/application.css').include?('.label-highlight')
-<<-CODE
-
- body * {
-   font-size: 100% !important;
- }
-
-.table {
-  border-bottom: 1px solid #dee2e6;
-}
-
-.table td {
-  vertical-align: middle !important;
-}
-
-.label-highlight {
-  font-size: 100% !important;
-  font-weight: inherit !important;
-  font-style: inherit !important;
-  color: #333 !important;
-  background: #fff401 !important;
-  padding: 0.25em 0.5em
-  border-radius: 5px;
-}
-
-nav.pagination {
-  text-align: center;
-  display: inline-block;
-}
-
-ul.pagination {
-  margin-bottom: 0;
-}
-
-CODE
-  else
-    ''
-  end
-end
-
-git commit: "-a -m 'Added custom style definitions into application.css'"
-
-# ----- Generate 1,000 articles -------------------------------------------------------------------
-
-puts
-say_status  "Database", "Creating 1,000 articles...", :yellow
-puts        '-'*80, '';
-
-run  "rails runner 'Article.__elasticsearch__.create_index! force: true'"
-rake "db:seed COUNT=1_000"
-
-# ----- Print Git log -----------------------------------------------------------------------------
-
-puts
-say_status  "Git", "Details about the application:", :yellow
-puts        '-'*80, ''
-
-git tag: "pretty"
-git log: "--reverse --oneline pretty...basic"
-
-# ----- Start the application ---------------------------------------------------------------------
-
-unless ENV['RAILS_NO_SERVER_START']
-  require 'net/http'
-  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
-    puts        "\n"
-    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
-    puts        '-'*80
-
-    port = ask("Please provide free port:", :bold)
-  else
-    port = '3000'
-  end
-
-  puts  "", "="*80
-  say_status  "DONE", "\e[1mStarting the application. Open http://localhost:#{port}\e[0m", :yellow
-  puts  "="*80, ""
-
-  run  "rails server --port=#{port}"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/03-expert.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/03-expert.rb
deleted file mode 100644
index f7f9040c71..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/03-expert.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
-
-unless File.read('README.md').include? '## [2] Pretty'
-  say_status  "ERROR", "You have to run the 01-basic.rb and 02-pretty.rb templates first.", :red
-  exit(1)
-end
-
-begin
-  require 'redis'
-rescue LoadError
-  say_status  "ERROR", "Please install the 'redis' gem before running this template", :red
-  exit(1)
-end
-
-begin
-  Redis.new.info
-rescue Redis::CannotConnectError
-  puts
-  say_status  "ERROR", "Redis not available", :red
-  say_status  "", "This template uses an asynchronous indexer via Sidekiq, and requires a running Redis server."
-  exit(1)
-end
-
-append_to_file 'README.md', <<-README
-
-## [3] Expert
-
-The `expert` template changes to a complex database schema with model relationships: article belongs
-to a category, has many authors and comments.
-
-* The Elasticsearch integration is refactored into the `Searchable` concern
-* A complex mapping for the index is defined
-* A custom serialization is defined in `Article#as_indexed_json`
-* The `search` method is amended with facets and suggestions
-* A [Sidekiq](http://sidekiq.org) worker for handling index updates in background is added
-* A custom `SearchController` with associated view is added
-* A Rails initializer is added to customize the Elasticsearch client configuration
-* Seed script and example data from New York Times is added
-
-README
-
-git add:    "README.md"
-git commit: "-m '[03] Updated the application README'"
-
-# ----- Add gems into Gemfile ---------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Adding Rubygems into Gemfile...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-gem "oj"
-
-git add:    "Gemfile*"
-git commit: "-m 'Added Ruby gems'"
-
-# ----- Customize the Rails console ---------------------------------------------------------------
-
-puts
-say_status  "Rails", "Customizing `rails console`...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-
-gem "pry", group: 'development'
-
-environment nil, env: 'development' do
-  %q{
-  console do
-    config.console = Pry
-    Pry.config.history.file = Rails.root.join('tmp/console_history.rb').to_s
-    Pry.config.prompt = [ proc { |obj, nest_level, _| "(#{obj})> " },
-                          proc { |obj, nest_level, _| ' '*obj.to_s.size + '  '*(nest_level+1)  + '| ' } ]
-  end
-  }
-end
-
-git add:    "Gemfile*"
-git add:    "config/"
-git commit: "-m 'Added Pry as the console for development'"
-
-# ----- Run bundle install ------------------------------------------------------------------------
-
-run "bundle install"
-
-# ----- Define and generate schema ----------------------------------------------------------------
-
-puts
-say_status  "Models", "Adding complex schema...\n", :yellow
-puts        '-'*80, ''
-
-generate :scaffold, "Category title"
-generate :scaffold, "Author first_name last_name"
-generate :scaffold, "Authorship article:references author:references"
-
-generate :model,     "Comment body:text user:string user_location:string stars:integer pick:boolean article:references"
-generate :migration, "CreateArticlesCategories article:references category:references"
-
-rake "db:drop"
-rake "db:migrate"
-
-insert_into_file "app/models/category.rb", :before => "end" do
-  <<-CODE
-  has_and_belongs_to_many :articles
-  CODE
-end
-
-insert_into_file "app/models/author.rb", :before => "end" do
-  <<-CODE
-  has_many :authorships
-
-  def full_name
-    [first_name, last_name].join(' ')
-  end
-  CODE
-end
-
-gsub_file "app/models/authorship.rb", %r{belongs_to :article$}, <<-CODE
-belongs_to :article, touch: true
-CODE
-
-insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
-  <<-CODE
-
-  has_and_belongs_to_many :categories, after_add:    [ lambda { |a,c| Indexer.perform_async(:update,  a.class.to_s, a.id) } ],
-                                       after_remove: [ lambda { |a,c| Indexer.perform_async(:update,  a.class.to_s, a.id) } ]
-  has_many                :authorships
-  has_many                :authors, through: :authorships
-  has_many                :comments
-  CODE
-end
-
-gsub_file "app/models/comment.rb", %r{belongs_to :article$}, <<-CODE
-belongs_to :article, touch: true
-CODE
-
-git add:    "."
-git commit: "-m 'Generated Category, Author and Comment resources'"
-
-# ----- Add the `abstract` column -----------------------------------------------------------------
-
-puts
-say_status  "Model", "Adding the `abstract` column to Article...\n", :yellow
-puts        '-'*80, ''
-
-generate :migration, "AddColumnsToArticle abstract:text url:string shares:integer"
-rake "db:migrate"
-
-git add:    "db/"
-git commit: "-m 'Added additional columns to Article'"
-
-# ----- Move the model integration into a concern -------------------------------------------------
-
-puts
-say_status  "Model", "Refactoring the model integration...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-remove_file 'app/models/article.rb'
-create_file 'app/models/article.rb', <<-CODE
-class Article < ActiveRecord::Base
-  include Searchable
-end
-CODE
-
-gsub_file "test/models/article_test.rb", %r{assert_equal 'foo', definition\[:query\]\[:multi_match\]\[:query\]}, "assert_equal 'foo', definition.to_hash[:query][:bool][:should][0][:multi_match][:query]"
-
-# copy_file File.expand_path('../searchable.rb', __FILE__), 'app/models/concerns/searchable.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.rb', 'app/models/concerns/searchable.rb'
-
-insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
-  <<-CODE
-
-  has_and_belongs_to_many :categories, after_add:    [ lambda { |a,c| Indexer.perform_async(:update,  a.class.to_s, a.id) } ],
-                                       after_remove: [ lambda { |a,c| Indexer.perform_async(:update,  a.class.to_s, a.id) } ]
-  has_many                :authorships
-  has_many                :authors, through: :authorships
-  has_many                :comments
-
-  CODE
-end
-
-git add:    "app/models/ test/models"
-git commit: "-m 'Refactored the Elasticsearch integration into a concern\n\nSee:\n\n* http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns\n* http://joshsymonds.com/blog/2012/10/25/rails-concerns-v-searchable-with-elasticsearch/'"
-
-# ----- Add Sidekiq indexer -----------------------------------------------------------------------
-
-puts
-say_status  "Sidekiq", "Adding Sidekiq worker for updating the index...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-gem "sidekiq"
-
-run "bundle install"
-
-# copy_file File.expand_path('../indexer.rb', __FILE__), 'app/workers/indexer.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/indexer.rb', 'app/workers/indexer.rb'
-
-insert_into_file "test/test_helper.rb",
-                 "require 'sidekiq/testing'\n\n",
-                 before: "class ActiveSupport::TestCase\n"
-
-git add:    "Gemfile* app/workers/ test/test_helper.rb"
-git commit: "-m 'Added a Sidekiq indexer\n\nRun:\n\n    $ bundle exec sidekiq --queue elasticsearch --verbose\n\nSee http://sidekiq.org'"
-
-# ----- Add SearchController -----------------------------------------------------------------------
-
-puts
-say_status  "Controllers", "Adding SearchController...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-create_file 'app/controllers/search_controller.rb' do
-  <<-CODE.gsub(/^  /, '')
-  class SearchController < ApplicationController
-    def index
-      options = {
-        category:       params[:c],
-        author:         params[:a],
-        published_week: params[:w],
-        published_day:  params[:d],
-        sort:           params[:s],
-        comments:       params[:comments]
-      }
-      @articles = Article.search(params[:q], options).page(params[:page]).results
-    end
-  end
-
-  CODE
-end
-
-# copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search_controller_test.rb', 'test/controllers/search_controller_test.rb'
-
-route "get '/search', to: 'search#index', as: 'search'"
-gsub_file 'config/routes.rb', %r{root to: 'articles#index'$}, "root to: 'search#index'"
-
-# copy_file File.expand_path('../index.html.erb', __FILE__), 'app/views/search/index.html.erb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.erb', 'app/views/search/index.html.erb'
-
-# copy_file File.expand_path('../search.css', __FILE__), 'app/assets/stylesheets/search.css'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search.css', 'app/assets/stylesheets/search.css'
-
-git add:    "app/controllers/ test/controllers/ config/routes.rb"
-git add:    "app/views/search/ app/assets/stylesheets/search.css"
-git commit: "-m 'Added SearchController#index'"
-
-# ----- Add SearchController -----------------------------------------------------------------------
-
-puts
-say_status  "Views", "Updating application layout...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-insert_into_file 'app/views/layouts/application.html.erb', <<-CODE, before: '</head>'
-  <link href="https://fonts.googleapis.com/css?family=Rokkitt:400,700" rel="stylesheet">
-CODE
-
-git commit: "-a -m 'Updated application template'"
-
-# ----- Add initializer ---------------------------------------------------------------------------
-
-puts
-say_status  "Application", "Adding Elasticsearch configuration in an initializer...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-create_file 'config/initializers/elasticsearch.rb', <<-CODE
-# Connect to specific Elasticsearch cluster
-ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || 'http://localhost:9200'
-
-Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL
-
-# Print Curl-formatted traces in development into a file
-#
-if Rails.env.development?
-  tracer = ActiveSupport::Logger.new('log/elasticsearch.log')
-  tracer.level =  Logger::DEBUG
-  Elasticsearch::Model.client.transport.tracer = tracer
-end
-CODE
-
-git add:    "config/initializers"
-git commit: "-m 'Added Rails initializer with Elasticsearch configuration'"
-
-# ----- Add Rake tasks ----------------------------------------------------------------------------
-
-puts
-say_status  "Application", "Adding Elasticsearch Rake tasks...\n", :yellow
-puts        '-'*80, ''; sleep 0.5
-
-create_file 'lib/tasks/elasticsearch.rake', <<-CODE
-require 'elasticsearch/rails/tasks/import'
-CODE
-
-git add:    "lib/tasks"
-git commit: "-m 'Added Rake tasks for Elasticsearch'"
-
-# ----- Insert and index data ---------------------------------------------------------------------
-
-puts
-say_status  "Database", "Re-creating the database with data and importing into Elasticsearch...", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-# copy_file File.expand_path('../articles.yml.gz', __FILE__), 'db/articles.yml.gz'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles.yml.gz', 'db/articles.yml.gz'
-
-remove_file 'db/seeds.rb'
-# copy_file File.expand_path('../seeds.rb', __FILE__), 'db/seeds.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/seeds.rb', 'db/seeds.rb'
-
-rake "db:reset"
-rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"
-
-git add:    "db/seeds.rb db/articles.yml.gz"
-git commit: "-m 'Added a seed script and source data'"
-
-# ----- Print Git log -----------------------------------------------------------------------------
-
-puts
-say_status  "Git", "Details about the application:", :yellow
-puts        '-'*80, ''
-
-git tag: "expert"
-git log: "--reverse --oneline HEAD...pretty"
-
-# ----- Start the application ---------------------------------------------------------------------
-
-unless ENV['RAILS_NO_SERVER_START']
-  require 'net/http'
-  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
-    puts        "\n"
-    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
-    puts        '-'*80
-
-    port = ask("Please provide free port:", :bold)
-  else
-    port = '3000'
-  end
-
-  puts  "", "="*80
-  say_status  "DONE", "\e[1mStarting the application. Open http://localhost:#{port}\e[0m", :yellow
-  puts  "="*80, ""
-
-  run  "rails server --port=#{port}"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/04-dsl.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/04-dsl.rb
deleted file mode 100644
index 163160b345..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/04-dsl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/04-dsl.rb
-
-unless File.read('README.md').include? '## [3] Expert'
-  say_status  "ERROR", "You have to run the 01-basic.rb, 02-pretty.rb and 03-expert.rb templates first.", :red
-  exit(1)
-end
-
-append_to_file 'README.md', <<-README
-
-## [4] DSL
-
-The `dsl` template refactors the search definition in SearchController#index
-to use the [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-ruby/tree/dsl/elasticsearch-dsl)
-Rubygem for better expresivity and readability of the code.
-
-README
-
-git add:    "README.md"
-git commit: "-m '[03] Updated the application README'"
-
-run 'rm -f app/assets/stylesheets/*.scss'
-run 'rm -f app/assets/javascripts/*.coffee'
-
-# ----- Add gems into Gemfile ---------------------------------------------------------------------
-
-puts
-say_status  "Rubygems", "Adding Rubygems into Gemfile...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-gem "elasticsearch-dsl", git: "git://github.com/elastic/elasticsearch-ruby.git"
-
-git add:    "Gemfile*"
-git commit: "-m 'Added the `elasticsearch-dsl` gem'"
-
-# ----- Run bundle install ------------------------------------------------------------------------
-
-run "bundle install"
-
-# ----- Change the search definition implementation and associated views and tests ----------------
-
-# copy_file File.expand_path('../searchable.dsl.rb', __FILE__), 'app/models/concerns/searchable.rb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb', 'app/models/concerns/searchable.rb', force: true
-
-# copy_file File.expand_path('../index.html.dsl.erb', __FILE__), 'app/views/search/index.html.erb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb', 'app/views/search/index.html.erb', force: true
-
-gsub_file "test/controllers/search_controller_test.rb", %r{test "should return facets" do.*?end}m, <<-CODE
-test "should return aggregations" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-    assert_equal 2, aggregations['published']['published']['buckets'].size
-
-    assert_equal 'John Smith', aggregations['authors']['authors']['buckets'][0]['key']
-    assert_equal 'One', aggregations['categories']['categories']['buckets'][0]['key']
-    assert_equal '2015-03-02T00:00:00.000Z', aggregations['published']['published']['buckets'][0]['key_as_string']
-  end
-CODE
-
-gsub_file "test/controllers/search_controller_test.rb", %r{test "should filter search results and the author and published date facets when user selects a category" do.*?end}m, <<-CODE
-test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, params: { q: 'one', c: 'One' }
-    assert_response :success
-
-    assert_equal 2, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['authors']['authors']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the category facet
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-  end
-CODE
-
-gsub_file "test/controllers/search_controller_test.rb", %r{test "should filter search results and the category and published date facets when user selects a category" do.*?end}m, <<-CODE
-test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, params: { q: 'one', a: 'Mary Smith' }
-    assert_response :success
-
-    assert_equal 1, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['categories']['categories']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the authors facet
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-  end
-CODE
-
-git add:    "app/models/concerns/ app/views/search/ test/controllers/search_controller_test.rb"
-git commit: "-m 'Updated the Article.search method to use the Ruby DSL and updated the associated views and tests'"
-
-# ----- Print Git log -----------------------------------------------------------------------------
-
-puts
-say_status  "Git", "Details about the application:", :yellow
-puts        '-'*80, ''
-
-git tag: "dsl"
-git log: "--reverse --oneline HEAD...expert"
-
-# ----- Start the application ---------------------------------------------------------------------
-
-unless ENV['RAILS_NO_SERVER_START']
-  require 'net/http'
-  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
-    puts        "\n"
-    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
-    puts        '-'*80
-
-    port = ask("Please provide free port:", :bold)
-  else
-    port = '3000'
-  end
-
-  puts  "", "="*80
-  say_status  "DONE", "\e[1mStarting the application. Open http://localhost:#{port}\e[0m", :yellow
-  puts  "="*80, ""
-
-  run  "rails server --port=#{port}"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/05-settings-files.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
deleted file mode 100644
index 4d09f48472..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
-
-# (See: 01-basic.rb, 02-pretty.rb, 03-expert.rb, 04-dsl.rb)
-
-append_to_file 'README.md', <<-README
-
-## [5] Settings Files
-
-The `settings-files` template refactors the `Searchable` module to load the index settings
-from an external file.
-
-README
-
-git add:    "README.md"
-git commit: "-m '[05] Updated the application README'"
-
-# ----- Setup the Searchable module to load settings from config/elasticsearch/articles_settings.json
-
-gsub_file "app/models/concerns/searchable.rb",
-    /index: { number_of_shards: 1, number_of_replicas: 0 }/,
-    "File.open('config/elasticsearch/articles_settings.json')"
-
-git add:    "app/models/concerns/searchable.rb"
-git commit: "-m 'Setup the Searchable module to load settings from file'"
-
-# ----- Copy the articles_settings.json file -------------------------------------------------------
-
-# copy_file File.expand_path('../articles_settings.json', __FILE__), 'config/elasticsearch/articles_settings.json'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles_settings.json',
-    'config/elasticsearch/articles_settings.json', force: true
-
-git add:    "config/elasticsearch/articles_settings.json"
-git commit: "-m 'Create the articles settings file'"
-
-# ----- Run bundle install ------------------------------------------------------------------------
-
-run "bundle install"
-
-# ----- Recreate the index ------------------------------------------------------------------------
-
-rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"
-
-# ----- Print Git log -----------------------------------------------------------------------------
-
-puts
-say_status  "Git", "Details about the application:", :yellow
-puts        '-'*80, ''
-
-git tag: "settings-files"
-git log: "--reverse --oneline HEAD...dsl"
-
-# ----- Start the application ---------------------------------------------------------------------
-
-unless ENV['RAILS_NO_SERVER_START']
-  require 'net/http'
-  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
-    puts        "\n"
-    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
-    puts        '-'*80
-
-    port = ask("Please provide free port:", :bold)
-  else
-    port = '3000'
-  end
-
-  puts  "", "="*80
-  say_status  "DONE", "\e[1mStarting the application. Open http://localhost:#{port}\e[0m", :yellow
-  puts  "="*80, ""
-
-  run  "rails server --port=#{port}"
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles.yml.gz b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles.yml.gz
deleted file mode 100644
index 665335ded0..0000000000
Binary files a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles.yml.gz and /dev/null differ
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles_settings.json b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles_settings.json
deleted file mode 100644
index c8fd35ea66..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/articles_settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "number_of_shards": 1, "number_of_replicas": 0 }
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb
deleted file mode 100644
index 97a9b8f81d..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb
+++ /dev/null
@@ -1,160 +0,0 @@
-<div class="col-md-12">
-  <h1 class="text-right"><%= link_to 'Search New York Times articles', root_path %></h1>
-
-  <%= form_tag search_path, method: 'get', role: 'search' do %>
-    <div class="input-group">
-      <%= text_field_tag :q, params[:q], class: 'form-control', placeholder: 'Search...' %>
-
-      <span class="input-group-btn">
-        <button type="submit" class="btn btn-default">
-          <span class="glyphicon glyphicon-search"></span>
-        </button>
-      </span>
-    </div>
-
-    <div id="form-options" class="clearfix">
-      <div class="btn-group pull-left">
-        <label class="checkbox-inline">
-          <%= check_box_tag 'comments', 'y', params[:comments] == 'y', onclick: "$(this).closest('form').submit()" %>
-          Search in comments?
-        </label>
-        <% params.slice(:a, :c, :s).each do |name, value| %>
-          <%= hidden_field_tag name, value %>
-        <% end %>
-      </div>
-
-      <div class="btn-group pull-right">
-        <p style="float: left; margin: 0.1em 0 0 0"><small>Displaying <%= (params[:page] || 1).to_i.ordinalize %> page with <%= @articles.size %> articles
-                   of <strong>total <%= @articles.total %></strong></small></p>
-
-        <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" style="margin-left: 0.5em">
-          <% sort = case
-              when params[:s] then params[:s]
-              when params[:q].blank? then 'published_on'
-              else 'relevancy'
-             end
-          %>
-          sorted by <%= sort.humanize.downcase %> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Sort by published on", search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: 'published_on')), class: 'btn-xs' %></li>
-          <li><%= link_to "Sort by relevancy",    search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: nil)), class: 'btn-xs' unless params[:q].blank?  %></li>
-        </ul>
-      </div>
-    </div>
-  <% end %>
-
-  <hr>
-</div>
-
-<% if @articles.size < 1 && @articles.response.suggestions.present? %>
-<div class="col-md-12">
-  <p class="alert alert-warning">
-    No documents have been found.
-    <% if @articles.response.suggestions.terms.present? %>
-      Maybe you mean
-      <%= @articles.response.suggestions.terms.map do |term|
-        link_to term, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge q: term)
-      end.to_sentence(last_word_connector: ' or ').html_safe %>?
-    <% end %>
-  </p>
-</div>
-<% end %>
-
-<div id="facets" class="col-md-3">
-  <% unless @articles.size < 1 %>
-
-    <div class="categories panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['categories']['categories']['buckets'].each do |c| %>
-        <%=
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: c['key'])),
-                  class: "list-group-item#{' active' if params[:c] == c['key']}" do
-                    c['key'].titleize.html_safe + content_tag(:small, c['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['authors']['authors']['buckets'].each do |a| %>
-        <%=
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: a['key'])),
-                  class: "list-group-item#{' active' if params[:a] == a['key']}" do
-                    a['key'].titleize.html_safe + content_tag(:small, a['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['published']['published']['buckets'].each do |w| %>
-        <%=
-          __start = Time.at(w['key']/1000)
-          __end   = __start.end_of_week
-          __date  = __start.to_date.to_s(:iso)
-
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: __date)),
-                  class: "list-group-item#{' active' if params[:w] == __date}" do
-                    "#{__start.to_date.to_s(:short)} &mdash; #{__end.to_date.to_s(:short)}".html_safe + \
-                    content_tag(:small, w['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-  <% end %>
-</div>
-
-<div class="col-md-9">
-  <div id="results">
-    <% @articles.each do |article|  %>
-      <div class="result">
-        <h3 class="title">
-          <%= (article.try(:highlight).try(:title) ? article.highlight.title.join.html_safe : article.title) %>
-          <small class="category"> | <%= article.categories.to_sentence %></small>
-        </h3>
-
-        <p class="body">
-          <% if article.try(:highlight).try(:abstract) %>
-            <%= article.highlight.abstract.join.html_safe %>
-          <% else  %>
-            <%= article.try(:highlight).try(:content) ? article.highlight.content.join('&hellip;').html_safe : article.abstract %>
-          <% end  %>
-        </p>
-
-        <% if comments = article.try(:highlight) && article.highlight['comments.body'] %>
-        <p class="comments">
-          Comments: <%= comments.join('&hellip;').html_safe %>
-        </p>
-        <% end  %>
-
-        <p class="text-muted">
-          <small>Authors: <%= article.authors.map(&:full_name).to_sentence %></small> |
-          <small>Published: <%= article.published_on %></small> |
-          <small>Score: <%= article._score %></small>
-        </p>
-      </div>
-    <% end %>
-  </div>
-
-  <ul class="pager">
-    <li class="previous"><%= link_to_previous_page @articles, 'Previous Page', params: params.slice(:q, :c, :a, :comments) %></li>
-    <li class="next"><%= link_to_next_page     @articles, 'Next Page', params: params.slice(:q, :c, :a, :comments) %></li>
-  </ul>
-
-</div>
-
-<div class="footer <%= @articles.size < 1 ? 'col-md-12' : 'col-md-9 col-md-offset-3' %>">
-  <p><small>Content provided by <a href="http://nytimes.com"><em>The New York Times</em></a>.</small></p>
-</div>
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.erb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.erb
deleted file mode 100644
index 656c1f8917..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/index.html.erb
+++ /dev/null
@@ -1,160 +0,0 @@
-<div class="col-md-12">
-  <h1 class="text-right"><%= link_to 'Search New York Times articles', root_path %></h1>
-
-  <%= form_tag search_path, method: 'get', role: 'search' do %>
-    <div class="input-group">
-      <%= text_field_tag :q, params[:q], class: 'form-control', placeholder: 'Search...' %>
-
-      <span class="input-group-btn">
-        <button type="submit" class="btn btn-default">
-          <span class="glyphicon glyphicon-search"></span>
-        </button>
-      </span>
-    </div>
-
-    <div id="form-options" class="clearfix">
-      <div class="btn-group pull-left">
-        <label class="checkbox-inline">
-          <%= check_box_tag 'comments', 'y', params[:comments] == 'y', onclick: "$(this).closest('form').submit()" %>
-          Search in comments?
-        </label>
-        <% params.slice(:a, :c, :s).each do |name, value| %>
-          <%= hidden_field_tag name, value %>
-        <% end %>
-      </div>
-
-      <div class="btn-group pull-right">
-        <p style="float: left; margin: 0.1em 0 0 0"><small>Displaying <%= (params[:page] || 1).to_i.ordinalize %> page with <%= @articles.size %> articles
-                   of <strong>total <%= @articles.total %></strong></small></p>
-
-        <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" style="margin-left: 0.5em">
-          <% sort = case
-              when params[:s] then params[:s]
-              when params[:q].blank? then 'published_on'
-              else 'relevancy'
-             end
-          %>
-          sorted by <%= sort.humanize.downcase %> <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Sort by published on", search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: 'published_on')), class: 'btn-xs' %></li>
-          <li><%= link_to "Sort by relevancy",    search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: nil)), class: 'btn-xs' unless params[:q].blank?  %></li>
-        </ul>
-      </div>
-    </div>
-  <% end %>
-
-  <hr>
-</div>
-
-<% if @articles.size < 1 && @articles.response.suggestions.present? %>
-<div class="col-md-12">
-  <p class="alert alert-warning">
-    No documents have been found.
-    <% if @articles.response.suggestions['suggest_title'].present? || @articles.response.suggestions['suggest_body'].present? %>
-      Maybe you mean
-      <%= @articles.response.suggestions.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq.map do |term|
-        link_to term, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge q: term)
-      end.to_sentence(last_word_connector: ' or ').html_safe %>?
-    <% end %>
-  </p>
-</div>
-<% end %>
-
-<div id="facets" class="col-md-3">
-  <% unless @articles.size < 1 %>
-
-    <div class="categories panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['categories']['categories']['buckets'].each do |c| %>
-        <%=
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: c['key'])),
-                  class: "list-group-item#{' active' if params[:c] == c['key']}" do
-                    c['key'].titleize.html_safe + content_tag(:small, c['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['authors']['authors']['buckets'].each do |a| %>
-        <%=
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: a['key'])),
-                  class: "list-group-item#{' active' if params[:a] == a['key']}" do
-                    a['key'].titleize.html_safe + content_tag(:small, a['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: nil))%></p>
-
-      <div class="list-group">
-        <% @articles.response.response['aggregations']['published']['published']['buckets'].each do |w| %>
-        <%=
-          __start = Time.at(w['key']/1000)
-          __end   = __start.end_of_week
-          __date  = __start.to_date.to_s(:iso)
-
-          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: __date)),
-                  class: "list-group-item#{' active' if params[:w] == __date}" do
-                    "#{__start.to_date.to_s(:short)} &mdash; #{__end.to_date.to_s(:short)}".html_safe + \
-                    content_tag(:small, w['doc_count'], class: 'badge').html_safe
-          end
-        %>
-        <% end %>
-      </div>
-    </div>
-  <% end %>
-</div>
-
-<div class="col-md-9">
-  <div id="results">
-    <% @articles.each do |article|  %>
-      <div class="result">
-        <h3 class="title">
-          <%= (article.try(:highlight).try(:title) ? article.highlight.title.join.html_safe : article.title) %>
-          <small class="category"> | <%= article.categories.to_sentence %></small>
-        </h3>
-
-        <p class="body">
-          <% if article.try(:highlight).try(:abstract) %>
-            <%= article.highlight.abstract.join.html_safe %>
-          <% else  %>
-            <%= article.try(:highlight).try(:content) ? article.highlight.content.join('&hellip;').html_safe : article.abstract %>
-          <% end  %>
-        </p>
-
-        <% if comments = article.try(:highlight) && article.highlight['comments.body'] %>
-        <p class="comments">
-          Comments: <%= comments.join('&hellip;').html_safe %>
-        </p>
-        <% end  %>
-
-        <p class="text-muted">
-          <small>Authors: <%= article.authors.map(&:full_name).to_sentence %></small> |
-          <small>Published: <%= article.published_on %></small> |
-          <small>Score: <%= article._score %></small>
-        </p>
-      </div>
-    <% end %>
-  </div>
-
-  <ul class="pager">
-    <li class="previous"><%= link_to_previous_page @articles, 'Previous Page', params: params.slice(:q, :c, :a, :comments) %></li>
-    <li class="next"><%= link_to_next_page     @articles, 'Next Page', params: params.slice(:q, :c, :a, :comments) %></li>
-  </ul>
-
-</div>
-
-<div class="footer <%= @articles.size < 1 ? 'col-md-12' : 'col-md-9 col-md-offset-3' %>">
-  <p><small>Content provided by <a href="http://nytimes.com"><em>The New York Times</em></a>.</small></p>
-</div>
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/indexer.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/indexer.rb
deleted file mode 100644
index 407c061099..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/indexer.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Indexer class for <http://sidekiq.org>
-#
-# Run me with:
-#
-#     $ bundle exec sidekiq --queue elasticsearch --verbose
-#
-class Indexer
-  include Sidekiq::Worker
-  sidekiq_options queue: 'elasticsearch', retry: false, backtrace: true
-
-  Logger = Sidekiq.logger.level == Logger::DEBUG ? Sidekiq.logger : nil
-  Client = Elasticsearch::Client.new host: (ENV['ELASTICSEARCH_URL'] || 'http://localhost:9200'), logger: Logger
-
-  def perform(operation, klass, record_id, options={})
-    logger.debug [operation, "#{klass}##{record_id} #{options.inspect}"]
-
-    case operation.to_s
-      when /index|update/
-        record = klass.constantize.find(record_id)
-        record.__elasticsearch__.client = Client
-        record.__elasticsearch__.__send__ "#{operation}_document"
-      when /delete/
-        Client.delete index: klass.constantize.index_name, type: klass.constantize.document_type, id: record_id
-      else raise ArgumentError, "Unknown operation '#{operation}'"
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search.css b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search.css
deleted file mode 100644
index dd2211d499..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search.css
+++ /dev/null
@@ -1,76 +0,0 @@
-h1 {
-  font-size: 28px !important;
-  color: #a3a3a3 !important;
-  text-transform: uppercase;
-  letter-spacing: -2px;
-}
-
-.label-highlight {
-  background: #f6fbfc !important;
-  box-shadow: 0px 1px 0px rgba(0,0,0,0.15);
-  padding: 0.2em 0.4em 0.2em 0.4em !important;
-}
-
-h3 .label-highlight {
-  background: transparent !important;
-  padding: 0.1em 0.4em 0px 0.4em !important;
-  border-bottom: 1px solid #999;
-  box-shadow: 0px 2px 1px rgba(0,0,0,0.15);
-  border-radius: 0;
-}
-
-.comments .label-highlight {
-  background: #fcfdf0 !important;
-}
-
-small.badge {
-  font-size: 80% !important;
-  font-weight: normal !important;
-  display: inline-block;
-  float: right;
-}
-
-form #form-options {
-  color: #666;
-  font-size: 95%;
-  margin-top: 1.5em;
-  padding: 0 0.25em;
-}
-form #form-options input {
-  margin-top: 0.25em;
-}
-
-#facets .panel-heading {
-  margin-bottom: 0;
-}
-
-.result {
-  border-bottom: 1px solid #ccc;
-  margin: 2em 0 0 0;
-  padding: 0 0 1em 0;
-}
-.result:first-child {
-  margin-top: 0.25em;
-}
-
-.result h3.title {
-  font-size: 180% !important;
-  font-family: 'Rokkitt', sans-serif;
-  margin-top: 0;
-}
-.result h3.title small {
-  font-size: 75% !important;
-}
-
-.result .body {
-  font-family: Georgia, serif;
-}
-
-.result .category {
-  font-family: 'Rokkitt', sans-serif;
-}
-
-.result .comments {
-  color: #666666;
-  font-size: 80%;
-}
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.dsl.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.dsl.rb
deleted file mode 100644
index d4c9cac051..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.dsl.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'test_helper'
-require 'sidekiq/api'
-
-class SearchControllerTest < ActionController::TestCase
-  setup do
-    travel_to Time.new(2015, 03, 16, 10, 00, 00, 0)
-
-    Article.delete_all
-
-    articles = [
-      { title: 'Article One', abstract: 'One', content: 'One', published_on: 1.day.ago, category_title: 'One', author_first_name: 'John', author_last_name: 'Smith' },
-      { title: 'Article One Another', abstract: '', content: '', published_on: 2.days.ago, category_title: 'One', author_first_name: 'John', author_last_name: 'Smith' },
-      { title: 'Article One Two', abstract: '', content: '', published_on: 10.days.ago, category_title: 'Two', author_first_name: 'Mary', author_last_name: 'Smith' },
-      { title: 'Article Two', abstract: '', content: '', published_on: 12.days.ago, category_title: 'Two', author_first_name: 'Mary', author_last_name: 'Smith' },
-      { title: 'Article Three', abstract: '', content: '', published_on: 12.days.ago, category_title: 'Three', author_first_name: 'Alice', author_last_name: 'Smith' }
-    ]
-
-    articles.each do |a|
-      article = Article.create! \
-        title:    a[:title],
-        abstract: a[:abstract],
-        content:  a[:content],
-        published_on: a[:published_on]
-
-      article.categories << Category.find_or_create_by!(title: a[:category_title])
-
-      article.authors << Author.find_or_create_by!(first_name: a[:author_first_name], last_name: a[:author_last_name])
-
-      article.save!
-    end
-
-    Article.find_by_title('Article Three').comments.create body: 'One'
-
-    Sidekiq::Queue.new("elasticsearch").clear
-
-    Article.__elasticsearch__.import force: true
-    Article.__elasticsearch__.refresh_index!
-  end
-
-  test "should return search results" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-    assert_equal 3, assigns(:articles).size
-  end
-
-  test "should return search results in comments" do
-    get :index, params: { q: 'one', comments: 'y' }
-    assert_response :success
-    assert_equal 4, assigns(:articles).size
-  end
-
-  test "should return highlighted snippets" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-    assert_match %r{<em class="label label-highlight">One</em>}, assigns(:articles).first.highlight.title.first
-  end
-
-  test "should return suggestions" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-
-    suggestions = assigns(:articles).response.suggestions
-
-    assert_equal 'one', suggestions['suggest_title'][0]['text']
-  end
-
-  test "should return aggregations" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-    assert_equal 2, aggregations['published']['published']['buckets'].size
-
-    assert_equal 'John Smith', aggregations['authors']['authors']['buckets'][0]['key']
-    assert_equal 'One', aggregations['categories']['categories']['buckets'][0]['key']
-    assert_equal '2015-03-02T00:00:00.000Z', aggregations['published']['published']['buckets'][0]['key_as_string']
-  end
-
-  test "should sort on the published date" do
-    get :index, params: { q: 'one', s: 'published_on' }
-    assert_response :success
-
-    assert_equal 3, assigns(:articles).size
-    assert_equal '2015-03-15', assigns(:articles)[0].published_on
-    assert_equal '2015-03-14', assigns(:articles)[1].published_on
-    assert_equal '2015-03-06', assigns(:articles)[2].published_on
-  end
-
-  test "should sort on the published date when no query is provided" do
-    get :index, params: { q: '' }
-    assert_response :success
-
-    assert_equal 5, assigns(:articles).size
-    assert_equal '2015-03-15', assigns(:articles)[0].published_on
-    assert_equal '2015-03-14', assigns(:articles)[1].published_on
-    assert_equal '2015-03-06', assigns(:articles)[2].published_on
-  end
-
-  test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, params: { q: 'one', c: 'One' }
-    assert_response :success
-
-    assert_equal 2, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['authors']['authors']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the category facet
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-  end
-
-  test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, params: { q: 'one', a: 'Mary Smith' }
-    assert_response :success
-
-    assert_equal 1, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['categories']['categories']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the authors facet
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.rb
deleted file mode 100644
index ca5ca29ba9..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/search_controller_test.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'test_helper'
-
-class SearchControllerTest < ActionController::TestCase
-  setup do
-    travel_to Time.new(2015, 03, 16, 10, 00, 00, 0)
-
-    Article.delete_all
-
-    articles = [
-      { title: 'Article One', abstract: 'One', content: 'One', published_on: 1.day.ago, category_title: 'One', author_first_name: 'John', author_last_name: 'Smith' },
-      { title: 'Article One Another', abstract: '', content: '', published_on: 2.days.ago, category_title: 'One', author_first_name: 'John', author_last_name: 'Smith' },
-      { title: 'Article One Two', abstract: '', content: '', published_on: 10.days.ago, category_title: 'Two', author_first_name: 'Mary', author_last_name: 'Smith' },
-      { title: 'Article Two', abstract: '', content: '', published_on: 12.days.ago, category_title: 'Two', author_first_name: 'Mary', author_last_name: 'Smith' },
-      { title: 'Article Three', abstract: '', content: '', published_on: 12.days.ago, category_title: 'Three', author_first_name: 'Alice', author_last_name: 'Smith' }
-    ]
-
-    articles.each do |a|
-      article = Article.create! \
-        title:    a[:title],
-        abstract: a[:abstract],
-        content:  a[:content],
-        published_on: a[:published_on]
-
-      article.categories << Category.find_or_create_by!(title: a[:category_title])
-
-      article.authors << Author.find_or_create_by!(first_name: a[:author_first_name], last_name: a[:author_last_name])
-
-      article.save!
-    end
-
-    Article.find_by_title('Article Three').comments.create body: 'One'
-
-    Sidekiq::Worker.clear_all
-
-    Article.__elasticsearch__.import force: true
-    Article.__elasticsearch__.refresh_index!
-  end
-
-  test "should return search results" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-    assert_equal 3, assigns(:articles).size
-  end
-
-  test "should return search results in comments" do
-    get :index, params: { q: 'one', comments: 'y' }
-    assert_response :success
-
-    assert_equal 4, assigns(:articles).size
-  end
-
-  test "should return highlighted snippets" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-    assert_match %r{<em class="label label-highlight">One</em>}, assigns(:articles).first.highlight.title.first
-  end
-
-  test "should return suggestions" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-
-    suggestions = assigns(:articles).response.suggestions
-
-    assert_equal 'one', suggestions['suggest_title'][0]['text']
-  end
-
-  test "should return facets" do
-    get :index, params: { q: 'one' }
-    assert_response :success
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-    assert_equal 2, aggregations['published']['published']['buckets'].size
-
-    assert_equal 'One', aggregations['categories']['categories']['buckets'][0]['key']
-    assert_equal 'John Smith', aggregations['authors']['authors']['buckets'][0]['key']
-    assert_equal 1425254400000, aggregations['published']['published']['buckets'][0]['key']
-  end
-
-  test "should sort on the published date" do
-    get :index, params: { q: 'one', s: 'published_on' }
-    assert_response :success
-
-    assert_equal 3, assigns(:articles).size
-    assert_equal '2015-03-15', assigns(:articles)[0].published_on
-    assert_equal '2015-03-14', assigns(:articles)[1].published_on
-    assert_equal '2015-03-06', assigns(:articles)[2].published_on
-  end
-
-  test "should sort on the published date when no query is provided" do
-    get :index, params: { q: '' }
-    assert_response :success
-
-    assert_equal 5, assigns(:articles).size
-    assert_equal '2015-03-15', assigns(:articles)[0].published_on
-    assert_equal '2015-03-14', assigns(:articles)[1].published_on
-    assert_equal '2015-03-06', assigns(:articles)[2].published_on
-  end
-
-  test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, params: { q: 'one', c: 'One' }
-    assert_response :success
-
-    assert_equal 2, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['authors']['authors']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the category facet
-    assert_equal 2, aggregations['categories']['categories']['buckets'].size
-  end
-
-  test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, params: { q: 'one', a: 'Mary Smith' }
-    assert_response :success
-
-    assert_equal 1, assigns(:articles).size
-
-    aggregations = assigns(:articles).response.response['aggregations']
-
-    assert_equal 1, aggregations['categories']['categories']['buckets'].size
-    assert_equal 1, aggregations['published']['published']['buckets'].size
-
-    # Do NOT filter the authors facet
-    assert_equal 2, aggregations['authors']['authors']['buckets'].size
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb
deleted file mode 100644
index 9ba6a0bb0e..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-module Searchable
-  extend ActiveSupport::Concern
-
-  included do
-    include Elasticsearch::Model
-
-    # Customize the index name
-    #
-    index_name [Rails.application.engine_name, Rails.env].join('_')
-
-    # Set up index configuration and mapping
-    #
-    settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-      mapping do
-        indexes :title, type: 'text' do
-          indexes :title,     analyzer: 'snowball'
-          indexes :tokenized, analyzer: 'simple'
-        end
-
-        indexes :content, type: 'text'  do
-          indexes :content,   analyzer: 'snowball'
-          indexes :tokenized, analyzer: 'simple'
-        end
-
-        indexes :published_on, type: 'date'
-
-        indexes :authors do
-          indexes :full_name, type: 'text' do
-            indexes :full_name
-            indexes :raw, type: 'keyword'
-          end
-        end
-
-        indexes :categories, type: 'keyword'
-
-        indexes :comments, type: 'nested' do
-          indexes :body, analyzer: 'snowball'
-          indexes :stars
-          indexes :pick
-          indexes :user, type: 'keyword'
-          indexes :user_location, type: 'text' do
-            indexes :user_location
-            indexes :raw, type: 'keyword'
-          end
-        end
-      end
-    end
-
-    # Set up callbacks for updating the index on model changes
-    #
-    after_commit lambda { Indexer.perform_async(:index,  self.class.to_s, self.id) }, on: :create
-    after_commit lambda { Indexer.perform_async(:update, self.class.to_s, self.id) }, on: :update
-    after_commit lambda { Indexer.perform_async(:delete, self.class.to_s, self.id) }, on: :destroy
-    after_touch  lambda { Indexer.perform_async(:update, self.class.to_s, self.id) }
-
-    # Customize the JSON serialization for Elasticsearch
-    #
-    def as_indexed_json(options={})
-      hash = self.as_json(
-        include: { authors:    { methods: [:full_name], only: [:full_name] },
-                   comments:   { only: [:body, :stars, :pick, :user, :user_location] }
-                 })
-      hash['categories'] = self.categories.map(&:title)
-      hash
-    end
-
-    # Return documents matching the user's query, include highlights and aggregations in response,
-    # and implement a "cross" faceted navigation
-    #
-    # @param q [String] The user query
-    # @return [Elasticsearch::Model::Response::Response]
-    #
-    def self.search(q, options={})
-      @search_definition = Elasticsearch::DSL::Search.search do
-        query do
-
-          # If a user query is present...
-          #
-          unless q.blank?
-            bool do
-
-              # ... search in `title`, `abstract` and `content`, boosting `title`
-              #
-              should do
-                multi_match do
-                  query    q
-                  fields   ['title^10', 'abstract^2', 'content']
-                  operator 'and'
-                end
-              end
-
-              # ... search in comment body if user checked the comments checkbox
-              #
-              if q.present? && options[:comments]
-                should do
-                  nested do
-                    path :comments
-                    query do
-                      multi_match do
-                        query q
-                        fields   'comments.body'
-                        operator 'and'
-                      end
-                    end
-                  end
-                end
-              end
-            end
-
-          # ... otherwise, just return all articles
-          else
-            match_all
-          end
-        end
-
-        # Filter the search results based on user selection
-        #
-        post_filter do
-          bool do
-            must { term categories: options[:category] } if options[:category]
-            must { match_all } if options.keys.none? { |k| [:c, :a, :w].include? k }
-            must { term 'authors.full_name.raw' => options[:author] } if options[:author]
-            must { range published_on: { gte: options[:published_week], lte: "#{options[:published_week]}||+1w" } } if options[:published_week]
-          end
-        end
-
-        # Return top categories for faceted navigation
-        #
-        aggregation :categories do
-          # Filter the aggregation with any selected `author` and `published_week`
-          #
-          f = Elasticsearch::DSL::Search::Filters::Bool.new
-          f.must { match_all }
-          f.must { term 'authors.full_name.raw' => options[:author] } if options[:author]
-          f.must { range published_on: { gte: options[:published_week], lte: "#{options[:published_week]}||+1w" } } if options[:published_week]
-
-          filter f.to_hash do
-            aggregation :categories do
-              terms field: 'categories'
-            end
-          end
-        end
-
-        # Return top authors for faceted navigation
-        #
-        aggregation :authors do
-          # Filter the aggregation with any selected `category` and `published_week`
-          #
-          f = Elasticsearch::DSL::Search::Filters::Bool.new
-          f.must { match_all }
-          f.must { term categories: options[:category] } if options[:category]
-          f.must { range published_on: { gte: options[:published_week], lte: "#{options[:published_week]}||+1w" } } if options[:published_week]
-
-          filter f do
-            aggregation :authors do
-              terms field: 'authors.full_name.raw'
-            end
-          end
-        end
-
-        # Return the published date ranges for faceted navigation
-        #
-        aggregation :published do
-          # Filter the aggregation with any selected `author` and `category`
-          #
-          f = Elasticsearch::DSL::Search::Filters::Bool.new
-          f.must { match_all }
-          f.must { term 'authors.full_name.raw' => options[:author] } if options[:author]
-          f.must { term categories: options[:category] } if options[:category]
-
-          filter f do
-            aggregation :published do
-              date_histogram do
-                field    'published_on'
-                interval 'week'
-              end
-            end
-          end
-        end
-
-        # Highlight the snippets in results
-        #
-        highlight do
-          fields title:    { number_of_fragments: 0 },
-                 abstract: { number_of_fragments: 0 },
-                 content:  { fragment_size: 50 }
-
-          field  'comments.body', fragment_size: 50 if q.present? && options[:comments]
-
-          pre_tags  '<em class="label label-highlight">'
-          post_tags '</em>'
-        end
-
-        case
-          # By default, sort by relevance, but when a specific sort option is present, use it ...
-          #
-          when options[:sort]
-            sort options[:sort].to_sym => 'desc'
-            track_scores true
-          #
-          # ... when there's no user query, sort on published date
-          #
-          when q.blank?
-            sort published_on: 'desc'
-        end
-
-        # Return suggestions unless there's no query from the user
-        unless q.blank?
-          suggest :suggest_title, text: q, term: { field: 'title.tokenized', suggest_mode: 'always' }
-          suggest :suggest_body,  text: q, term: { field: 'content.tokenized', suggest_mode: 'always' }
-        end
-      end
-
-      __elasticsearch__.search(@search_definition)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.rb
deleted file mode 100644
index 45fbf75d4f..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/searchable.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-module Searchable
-  extend ActiveSupport::Concern
-
-  included do
-    include Elasticsearch::Model
-
-    # Customize the index name
-    #
-    index_name [Rails.application.engine_name, Rails.env].join('_')
-
-    # Set up index configuration and mapping
-    #
-    settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-      mapping do
-        indexes :title, type: 'text' do
-          indexes :title,     analyzer: 'snowball'
-          indexes :tokenized, analyzer: 'simple'
-        end
-
-        indexes :content, type: 'text'  do
-          indexes :content,   analyzer: 'snowball'
-          indexes :tokenized, analyzer: 'simple'
-        end
-
-        indexes :published_on, type: 'date'
-
-        indexes :authors do
-          indexes :full_name, type: 'text' do
-            indexes :full_name
-            indexes :raw, type: 'keyword'
-          end
-        end
-
-        indexes :categories, type: 'keyword'
-
-        indexes :comments, type: 'nested' do
-          indexes :body, analyzer: 'snowball'
-          indexes :stars
-          indexes :pick
-          indexes :user, type: 'keyword'
-          indexes :user_location, type: 'text' do
-            indexes :user_location
-            indexes :raw, type: 'keyword'
-          end
-        end
-      end
-    end
-
-    # Set up callbacks for updating the index on model changes
-    #
-    after_commit lambda { Indexer.perform_async(:index,  self.class.to_s, self.id) }, on: :create
-    after_commit lambda { Indexer.perform_async(:update, self.class.to_s, self.id) }, on: :update
-    after_commit lambda { Indexer.perform_async(:delete, self.class.to_s, self.id) }, on: :destroy
-    after_touch  lambda { Indexer.perform_async(:update, self.class.to_s, self.id) }
-
-    # Customize the JSON serialization for Elasticsearch
-    #
-    def as_indexed_json(options={})
-      hash = self.as_json(
-        include: { authors:    { methods: [:full_name], only: [:full_name] },
-                   comments:   { only: [:body, :stars, :pick, :user, :user_location] }
-                 })
-      hash['categories'] = self.categories.map(&:title)
-      hash
-    end
-
-    # Search in title and content fields for `query`, include highlights in response
-    #
-    # @param query [String] The user query
-    # @return [Elasticsearch::Model::Response::Response]
-    #
-    def self.search(query, options={})
-
-      # Prefill and set the filters (top-level `post_filter` and aggregation `filter` elements)
-      #
-      __set_filters = lambda do |key, f|
-        @search_definition[:post_filter][:bool] ||= {}
-        @search_definition[:post_filter][:bool][:must] ||= []
-        @search_definition[:post_filter][:bool][:must]  |= [f]
-
-        @search_definition[:aggregations][key.to_sym][:filter][:bool][:must] ||= []
-        @search_definition[:aggregations][key.to_sym][:filter][:bool][:must]  |= [f]
-      end
-
-      @search_definition = {
-        query: {},
-
-        highlight: {
-          pre_tags: ['<em class="label label-highlight">'],
-          post_tags: ['</em>'],
-          fields: {
-            title:    { number_of_fragments: 0 },
-            abstract: { number_of_fragments: 0 },
-            content:  { fragment_size: 50 }
-          }
-        },
-
-        post_filter: { bool: { must: [ match_all: {} ] } },
-
-        aggregations: {
-          categories: {
-            filter: { bool: { must: [ match_all: {} ] } },
-            aggregations: { categories: { terms: { field: 'categories' } } }
-          },
-          authors: {
-            filter: { bool: { must: [ match_all: {} ] } },
-            aggregations: { authors: { terms: { field: 'authors.full_name.raw' } } }
-          },
-          published: {
-            filter: { bool: { must: [ match_all: {} ] } },
-            aggregations: {
-              published: { date_histogram: { field: 'published_on', interval: 'week' } }
-            }
-          }
-        }
-      }
-
-      unless query.blank?
-        @search_definition[:query] = {
-          bool: {
-            should: [
-              { multi_match: {
-                  query: query,
-                  fields: ['title^10', 'abstract^2', 'content'],
-                  operator: 'and'
-                }
-              }
-            ]
-          }
-        }
-      else
-        @search_definition[:query] = { match_all: {} }
-        @search_definition[:sort]  = { published_on: 'desc' }
-      end
-
-      if options[:category]
-        f = { term: { categories: options[:category] } }
-
-        __set_filters.(:authors, f)
-        __set_filters.(:published, f)
-      end
-
-      if options[:author]
-        f = { term: { 'authors.full_name.raw' => options[:author] } }
-
-        __set_filters.(:categories, f)
-        __set_filters.(:published, f)
-      end
-
-      if options[:published_week]
-        f = {
-          range: {
-            published_on: {
-              gte: options[:published_week],
-              lte: "#{options[:published_week]}||+1w"
-            }
-          }
-        }
-
-        __set_filters.(:categories, f)
-        __set_filters.(:authors, f)
-      end
-
-      if query.present? && options[:comments]
-        @search_definition[:query][:bool][:should] ||= []
-        @search_definition[:query][:bool][:should] << {
-          nested: {
-            path: 'comments',
-            query: {
-              multi_match: {
-                query: query,
-                fields: ['comments.body'],
-                operator: 'and'
-              }
-            }
-          }
-        }
-        @search_definition[:highlight][:fields].update 'comments.body' => { fragment_size: 50 }
-      end
-
-      if options[:sort]
-        @search_definition[:sort]  = { options[:sort] => 'desc' }
-        @search_definition[:track_scores] = true
-      end
-
-      unless query.blank?
-        @search_definition[:suggest] = {
-          text: query,
-          suggest_title: {
-            term: {
-              field: 'title.tokenized',
-              suggest_mode: 'always'
-            }
-          },
-          suggest_body: {
-            term: {
-              field: 'content.tokenized',
-              suggest_mode: 'always'
-            }
-          }
-        }
-      end
-
-      __elasticsearch__.search(@search_definition)
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/seeds.rb b/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/seeds.rb
deleted file mode 100644
index b9e2ecbd89..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/lib/rails/templates/seeds.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'zlib'
-require 'yaml'
-
-Zlib::GzipReader.open(File.expand_path('../articles.yml.gz', __FILE__)) do |gzip|
-  puts "Reading articles from gzipped YAML..."
-  @documents = YAML.respond_to?(:load_documents) ? YAML.load_documents(gzip.read) : 
-    YAML.load_stream(gzip.read)
-end
-
-# Truncate the default ActiveRecord logger output
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDERR)
-ActiveRecord::Base.logger.instance_eval do
-  @formatter = lambda do |s, d, p, message|
-    message
-      .gsub(/\[("content", ".*?")\]/m) { |match| match[0..100] + '..."]' }
-      .gsub(/\[("body", ".*?")\]/m   ) { |match| match[0..100] + '..."]' }
-      .strip
-      .concat("\n")
-  end
-end
-
-# Reduce verbosity and truncate the request body of Elasticsearch logger
-Article.__elasticsearch__.client.transport.tracer.level = Logger::INFO
-Article.__elasticsearch__.client.transport.tracer.formatter = lambda do |s, d, p, message|
-  "\n\n" + (message.size > 105 ? message[0..105].concat("...}'") : message) + "\n\n"
-end
-
-# Skip model callbacks
-%w| _touch_callbacks
-    _commit_callbacks
-    after_add_for_categories
-    after_add_for_authorships
-    after_add_for_authors
-    after_add_for_comments  |.each do |c|
-    Article.class.__send__ :define_method, c do; []; end
-  end
-
-@documents.each do |document|
-  article = Article.create! document.slice(:title, :abstract, :content, :url, :shares, :published_on)
-
-  article.categories = document[:categories].map do |d|
-    Category.find_or_create_by! title: d
-  end
-
-  article.authors = document[:authors].map do |d|
-    first_name, last_name = d.split(' ').compact.map(&:strip)
-    Author.find_or_create_by! first_name: first_name, last_name: last_name
-  end
-
-  document[:comments].each { |d| article.comments.create! d }
-
-  article.save!
-end
-
-# Remove any jobs from the "elasticsearch" Sidekiq queue
-#
-require 'sidekiq/api'
-Sidekiq::Queue.new("elasticsearch").clear
diff --git a/elasticsearch-rails/elasticsearch-rails/spec/instrumentation_spec.rb b/elasticsearch-rails/elasticsearch-rails/spec/instrumentation_spec.rb
deleted file mode 100644
index 2327800d1c..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/spec/instrumentation_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe 'ActiveSupport::Instrumentation integration' do
-
-  before(:all) do
-    class DummyInstrumentationModel
-      extend Elasticsearch::Model::Searching::ClassMethods
-
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
-    end
-  end
-
-  after(:all) do
-    remove_classes(DummyInstrumentationModel)
-  end
-
-  let(:response_document) do
-    { 'took' => '5ms',
-      'hits' => { 'total' => 123,
-                  'max_score' => 456,
-                  'hits' => [] } }
-  end
-
-  let(:search) do
-    Elasticsearch::Model::Searching::SearchRequest.new(DummyInstrumentationModel, 'foo')
-  end
-
-  let(:client) do
-    double('client', search: response_document)
-  end
-
-  before do
-    allow(DummyInstrumentationModel).to receive(:client).and_return(client)
-    Elasticsearch::Rails::Instrumentation::Railtie.run_initializers
-  end
-
-  context 'SearchRequest#execute!' do
-
-    it 'wraps the method with instrumentation' do
-      expect(search).to respond_to(:execute_without_instrumentation!)
-      expect(search).to respond_to(:execute_with_instrumentation!)
-    end
-  end
-
-  context 'Model#search' do
-
-    before do
-      expect(ActiveSupport::Notifications).to receive(:instrument).with('search.elasticsearch',
-                                                                        { klass: 'DummyInstrumentationModel',
-                                                                          name: 'Search',
-                                                                          search: { body: query,
-                                                                          index: 'foo',
-                                                                          type: 'bar' } }).and_return({})
-    end
-
-    let(:query) do
-      { query: { match: { foo: 'bar' } } }
-    end
-
-    let(:logged_message) do
-      @logger.logged(:debug).first
-    end
-
-    it 'publishes a notification' do
-      expect(DummyInstrumentationModel.search(query).response).to eq({})
-    end
-
-    context 'when a message is logged', unless: defined?(RUBY_VERSION) && RUBY_VERSION > '2.2' do
-
-      let(:query) do
-        { query: { match: { moo: 'bam' } } }
-      end
-
-      it 'prints the debug information to the log' do
-        expect(logged_message).to match(/DummyInstrumentationModel Search \(\d+\.\d+ms\)/)
-        expect(logged_message).to match(/body\: \{query\: \{match\: \{moo\: "bam"\}\}\}\}/)
-      end
-    end
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/spec/lograge_spec.rb b/elasticsearch-rails/elasticsearch-rails/spec/lograge_spec.rb
deleted file mode 100644
index 3192d40896..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/spec/lograge_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-require 'action_pack'
-require 'lograge'
-require 'elasticsearch/rails/lograge'
-
-describe 'ActiveSupport::Instrumentation integration' do
-
-  before do
-    Elasticsearch::Rails::Lograge::Railtie.run_initializers
-  end
-
-  it 'customizes the Lograge configuration' do
-    expect(Elasticsearch::Rails::Lograge::Railtie.initializers
-               .select { |i| i.name == 'elasticsearch.lograge' }
-               .first).not_to be_nil
-  end
-end
diff --git a/elasticsearch-rails/elasticsearch-rails/spec/spec_helper.rb b/elasticsearch-rails/elasticsearch-rails/spec/spec_helper.rb
deleted file mode 100644
index d92dc52339..0000000000
--- a/elasticsearch-rails/elasticsearch-rails/spec/spec_helper.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'pry-nav'
-require 'active_record'
-require 'elasticsearch/model'
-require 'elasticsearch/rails'
-require 'rails/railtie'
-require 'elasticsearch/rails/instrumentation'
-
-
-unless defined?(ELASTICSEARCH_URL)
-  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
-end
-
-RSpec.configure do |config|
-  config.formatter = 'documentation'
-  config.color = true
-
-  config.before(:suite) do
-    require 'ansi'
-    tracer = ::Logger.new(STDERR)
-    tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                                            tracer: (ENV['QUIET'] ? nil : tracer)
-
-    unless ActiveRecord::Base.connected?
-      ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
-    end
-
-    if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
-      ::ActiveRecord::Base.raise_in_transactional_callbacks = true
-    end
-  end
-end
-
-# Remove all classes.
-#
-# @param [ Array<Class> ] classes The list of classes to remove.
-#
-# @return [ true ]
-#
-# @since 6.0.1
-def remove_classes(*classes)
-  classes.each do |_class|
-    Object.send(:remove_const, _class.name.to_sym) if defined?(_class)
-  end and true
-end
diff --git a/lib/bulk_imports/common/pipelines/wiki_pipeline.rb b/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
index 6900835b14..0f92c1f121 100644
--- a/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
+++ b/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
@@ -22,7 +22,7 @@ module BulkImports
           wiki = context.portable.wiki
           url = data[:url].sub("://", "://oauth2:#{context.configuration.access_token}@")
 
-          Gitlab::UrlBlocker.validate!(url, allow_local_network: allow_local_requests?, allow_localhost: allow_local_requests?)
+          Gitlab::UrlBlocker.validate!(url, schemes: %w[http https], allow_local_network: allow_local_requests?, allow_localhost: allow_local_requests?)
 
           wiki.ensure_repository
           wiki.repository.fetch_as_mirror(url)
diff --git a/lib/bulk_imports/projects/pipelines/repository_pipeline.rb b/lib/bulk_imports/projects/pipelines/repository_pipeline.rb
index f5ccc1dd92..a2b1f8c517 100644
--- a/lib/bulk_imports/projects/pipelines/repository_pipeline.rb
+++ b/lib/bulk_imports/projects/pipelines/repository_pipeline.rb
@@ -21,7 +21,7 @@ module BulkImports
           url = url.sub("://", "://oauth2:#{context.configuration.access_token}@")
           project = context.portable
 
-          Gitlab::UrlBlocker.validate!(url, allow_local_network: allow_local_requests?, allow_localhost: allow_local_requests?)
+          Gitlab::UrlBlocker.validate!(url, schemes: %w[http https], allow_local_network: allow_local_requests?, allow_localhost: allow_local_requests?)
 
           project.ensure_repository
           project.repository.fetch_as_mirror(url)
diff --git a/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline.rb b/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline.rb
index 6d423717a5..e29601927b 100644
--- a/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline.rb
+++ b/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline.rb
@@ -55,7 +55,9 @@ module BulkImports
           Gitlab::UrlBlocker.validate!(
             url,
             allow_local_network: allow_local_requests?,
-            allow_localhost: allow_local_requests?)
+            allow_localhost: allow_local_requests?,
+            schemes: %w[http https]
+          )
         end
 
         def cleanup_snippet_repository(snippet)
diff --git a/lib/error_tracking/sentry_client.rb b/lib/error_tracking/sentry_client.rb
index 6a341ddbe8..67c57a0798 100644
--- a/lib/error_tracking/sentry_client.rb
+++ b/lib/error_tracking/sentry_client.rb
@@ -10,6 +10,7 @@ module ErrorTracking
 
     Error = Class.new(StandardError)
     MissingKeysError = Class.new(StandardError)
+    InvalidFieldValueError = Class.new(StandardError)
 
     attr_accessor :url, :token
 
@@ -92,5 +93,15 @@ module ErrorTracking
     def raise_error(message)
       raise SentryClient::Error, message
     end
+
+    def ensure_numeric!(field, value)
+      return value if /\A\d+\z/.match?(value)
+
+      raise_invalid_field_value!(field, "#{value.inspect} is not numeric")
+    end
+
+    def raise_invalid_field_value!(field, message)
+      raise InvalidFieldValueError, %(Sentry API response contains invalid value for field "#{field}": #{message})
+    end
   end
 end
diff --git a/lib/error_tracking/sentry_client/event.rb b/lib/error_tracking/sentry_client/event.rb
index 1db31abeeb..d8ae81f541 100644
--- a/lib/error_tracking/sentry_client/event.rb
+++ b/lib/error_tracking/sentry_client/event.rb
@@ -16,7 +16,7 @@ module ErrorTracking
 
         Gitlab::ErrorTracking::ErrorEvent.new(
           project_id: event['projectID'],
-          issue_id: event['groupID'],
+          issue_id: ensure_numeric!('issue_id', event['groupID']),
           date_received: event['dateReceived'],
           stack_trace_entries: stack_trace
         )
diff --git a/lib/error_tracking/sentry_client/issue.rb b/lib/error_tracking/sentry_client/issue.rb
index d0e6bd783f..18a686df4f 100644
--- a/lib/error_tracking/sentry_client/issue.rb
+++ b/lib/error_tracking/sentry_client/issue.rb
@@ -120,8 +120,10 @@ module ErrorTracking
       end
 
       def map_to_error(issue)
+        id = ensure_numeric!('id', issue.fetch('id'))
+
         Gitlab::ErrorTracking::Error.new(
-          id: issue.fetch('id'),
+          id: id,
           first_seen: issue.fetch('firstSeen', nil),
           last_seen: issue.fetch('lastSeen', nil),
           title: issue.fetch('title', nil),
@@ -130,7 +132,7 @@ module ErrorTracking
           count: issue.fetch('count', nil),
           message: issue.dig('metadata', 'value'),
           culprit: issue.fetch('culprit', nil),
-          external_url: issue_url(issue.fetch('id')),
+          external_url: issue_url(id),
           short_id: issue.fetch('shortId', nil),
           status: issue.fetch('status', nil),
           frequency: issue.dig('stats', '24h'),
@@ -141,8 +143,10 @@ module ErrorTracking
       end
 
       def map_to_detailed_error(issue)
+        id = ensure_numeric!('id', issue.fetch('id'))
+
         Gitlab::ErrorTracking::DetailedError.new(
-          id: issue.fetch('id'),
+          id: id,
           first_seen: issue.fetch('firstSeen', nil),
           last_seen: issue.fetch('lastSeen', nil),
           tags: extract_tags(issue),
@@ -152,7 +156,7 @@ module ErrorTracking
           count: issue.fetch('count', nil),
           message: issue.dig('metadata', 'value'),
           culprit: issue.fetch('culprit', nil),
-          external_url: issue_url(issue.fetch('id')),
+          external_url: issue_url(id),
           external_base_url: project_url,
           short_id: issue.fetch('shortId', nil),
           status: issue.fetch('status', nil),
diff --git a/lib/gitlab/checks/tag_check.rb b/lib/gitlab/checks/tag_check.rb
index 5dd7720b67..007a775eaf 100644
--- a/lib/gitlab/checks/tag_check.rb
+++ b/lib/gitlab/checks/tag_check.rb
@@ -9,11 +9,13 @@ module Gitlab
         delete_protected_tag: 'You are not allowed to delete protected tags from this project. '\
           'Only a project maintainer or owner can delete a protected tag.',
         delete_protected_tag_non_web: 'You can only delete protected tags using the web interface.',
-        create_protected_tag: 'You are not allowed to create this tag as it is protected.'
+        create_protected_tag: 'You are not allowed to create this tag as it is protected.',
+        default_branch_collision: 'You cannot use default branch name to create a tag'
       }.freeze
 
       LOG_MESSAGES = {
         tag_checks: "Checking if you are allowed to change existing tags...",
+        default_branch_collision_check: "Checking if you are providing a valid tag name...",
         protected_tag_checks: "Checking if you are creating, updating or deleting a protected tag..."
       }.freeze
 
@@ -26,6 +28,7 @@ module Gitlab
           end
         end
 
+        default_branch_collision_check
         protected_tag_checks
       end
 
@@ -52,6 +55,14 @@ module Gitlab
           end
         end
       end
+
+      def default_branch_collision_check
+        logger.log_timed(LOG_MESSAGES[:default_branch_collision_check]) do
+          if creation? && tag_name == project.default_branch
+            raise GitAccess::ForbiddenError, ERROR_MESSAGES[:default_branch_collision]
+          end
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/ci/ansi2json/line.rb b/lib/gitlab/ci/ansi2json/line.rb
index e48080993a..abe2f272ca 100644
--- a/lib/gitlab/ci/ansi2json/line.rb
+++ b/lib/gitlab/ci/ansi2json/line.rb
@@ -80,7 +80,8 @@ module Gitlab
         end
 
         def set_section_duration(duration_in_seconds)
-          duration = ActiveSupport::Duration.build(duration_in_seconds.to_i)
+          normalized_duration_in_seconds = duration_in_seconds.to_i.clamp(0, 1.year)
+          duration = ActiveSupport::Duration.build(normalized_duration_in_seconds)
           hours = duration.in_hours.floor
           hours = hours > 0 ? "%02d" % hours : nil
           minutes = "%02d" % duration.parts[:minutes].to_i
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb
index b0bf68f420..58b46a85aa 100644
--- a/lib/gitlab/gfm/uploads_rewriter.rb
+++ b/lib/gitlab/gfm/uploads_rewriter.rb
@@ -23,33 +23,24 @@ module Gitlab
       def rewrite(target_parent)
         return @text unless needs_rewrite?
 
-        @text.gsub!(@pattern) do |markdown|
-          file = find_file($~[:secret], $~[:file])
-          # No file will be returned for a path traversal
-          next if file.nil?
+        @target_parent = target_parent
 
-          break markdown unless file.try(:exists?)
-
-          klass = target_parent.is_a?(Namespace) ? NamespaceFileUploader : FileUploader
-          moved = klass.copy_to(file, target_parent)
-
-          moved_markdown = moved.markdown_link
-
-          # Prevents rewrite of plain links as embedded
-          if was_embedded?(markdown)
-            moved_markdown
-          else
-            moved_markdown.delete_prefix('!')
-          end
+        rewritten_text = Gitlab::StringRegexMarker.new(@text).mark(@pattern) do |markdown, left:, right:, mode:|
+          transform_markdown(markdown)
         end
+
+        # MarkdownContentRewriterService relies on the text being changed _in place_.
+        @text.gsub!(@text, rewritten_text)
       end
 
       def needs_rewrite?
         strong_memoize(:needs_rewrite) do
-          FileUploader::MARKDOWN_PATTERN.match?(@text)
+          @pattern.match?(@text)
         end
       end
 
+      private
+
       def was_embedded?(markdown)
         markdown.starts_with?("!")
       end
@@ -57,6 +48,28 @@ module Gitlab
       def find_file(secret, file_name)
         UploaderFinder.new(@source_project, secret, file_name).execute
       end
+
+      def transform_markdown(markdown)
+        match = @pattern.match(markdown)
+        file = find_file(match[:secret], match[:file])
+
+        # No file will be returned for a path traversal
+        return '' if file.nil?
+
+        return markdown unless file.try(:exists?)
+
+        klass = @target_parent.is_a?(Namespace) ? NamespaceFileUploader : FileUploader
+        moved = klass.copy_to(file, @target_parent)
+
+        moved_markdown = moved.markdown_link
+
+        # Prevents rewrite of plain links as embedded
+        if was_embedded?(markdown)
+          moved_markdown
+        else
+          moved_markdown.delete_prefix('!')
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/hook_data/group_member_builder.rb b/lib/gitlab/hook_data/group_member_builder.rb
index 2998550a4b..d70885018e 100644
--- a/lib/gitlab/hook_data/group_member_builder.rb
+++ b/lib/gitlab/hook_data/group_member_builder.rb
@@ -39,7 +39,7 @@ module Gitlab
           group_id: group_member.group.id,
           user_username: group_member.user.username,
           user_name: group_member.user.name,
-          user_email: group_member.user.email,
+          user_email: group_member.user.webhook_email,
           user_id: group_member.user.id,
           group_access: group_member.human_access,
           expires_at: group_member.expires_at&.xmlschema
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb
index d5c018cfc6..d2916a0180 100644
--- a/lib/gitlab/json_cache.rb
+++ b/lib/gitlab/json_cache.rb
@@ -43,9 +43,7 @@ module Gitlab
     end
 
     def write(key, value, options = nil)
-      # As we use json as the serialization format, return everything from
-      # ActiveModel objects included encrypted values.
-      backend.write(cache_key(key), value.to_json(unsafe_serialization_hash: true), options)
+      backend.write(cache_key(key), value.to_json, options)
     end
 
     def fetch(key, options = {}, &block)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e7b5e6ec73..01cc066012 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1012,11 +1012,6 @@ msgstr ""
 msgid "%{start} to %{end}"
 msgstr ""
 
-msgid "%{strongOpen}%{errors}%{strongClose} point"
-msgid_plural "%{strongOpen}%{errors}%{strongClose} points"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%{strongOpen}Warning:%{strongClose} SAML group links can cause GitLab to automatically remove members from groups."
 msgstr ""
 
@@ -1053,6 +1048,11 @@ msgid_plural "%{strong_start}%{count} members%{strong_end} must approve to merge
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%{strong_start}%{errors}%{strong_end} point"
+msgid_plural "%{strong_start}%{errors}%{strong_end} points"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%{strong_start}%{human_size}%{strong_end} Project Storage"
 msgstr ""
 
@@ -39570,9 +39570,6 @@ msgstr ""
 msgid "There are several size limits in place."
 msgstr ""
 
-msgid "There are unsubmitted review comments."
-msgstr ""
-
 msgid "There is already a repository with that name on disk"
 msgstr ""
 
diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index 1fd249eba6..3e1cdfccc6 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -427,6 +427,22 @@ RSpec.describe Boards::IssuesController do
   end
 
   describe 'POST create' do
+    context 'when trying to create issue on an unauthorized project' do
+      let(:unauthorized_project) { create(:project, :private) }
+      let(:issue_params) { { project_id: unauthorized_project.id } }
+
+      it 'creates the issue on the board\'s project' do
+        expect do
+          create_issue user: user, board: board, list: list1, title: 'New issue', additional_issue_params: issue_params
+        end.to change(Issue, :count).by(1)
+
+        created_issue = Issue.last
+
+        expect(created_issue.project).to eq(project)
+        expect(unauthorized_project.reload.issues.count).to eq(0)
+      end
+    end
+
     context 'with valid params' do
       before do
         create_issue user: user, board: board, list: list1, title: 'New issue'
@@ -500,13 +516,13 @@ RSpec.describe Boards::IssuesController do
       end
     end
 
-    def create_issue(user:, board:, list:, title:)
+    def create_issue(user:, board:, list:, title:, additional_issue_params: {})
       sign_in(user)
 
       post :create, params: {
                       board_id: board.to_param,
                       list_id: list.to_param,
-                      issue: { title: title, project_id: project.id }
+                      issue: { title: title, project_id: project.id }.merge(additional_issue_params)
                     },
                     format: :json
     end
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index f892b01e62..fafaea8ac6 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe 'Merge request > Batch comments', :js do
 
         write_diff_comment
 
-        visit_overview_with_pending_comment
+        visit_overview
       end
 
       it 'can add comment to review' do
@@ -232,14 +232,6 @@ RSpec.describe 'Merge request > Batch comments', :js do
     wait_for_requests
   end
 
-  def visit_overview_with_pending_comment
-    accept_alert do
-      visit project_merge_request_path(merge_request.project, merge_request)
-    end
-
-    wait_for_requests
-  end
-
   def write_diff_comment(**params)
     click_diff_line(find_by_scrolling("[id='#{sample_compare.changes[0][:line_code]}']"))
 
diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index ddfed73e2c..63e0ee4a25 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -209,7 +209,9 @@ RSpec.describe 'Projects > Settings > Repository settings' do
       end
 
       it 'generates an SSH public key on submission', :js do
-        fill_in 'url', with: 'ssh://user@localhost/project.git'
+        fill_in 'url', with: ssh_url
+        expect(page).to have_css(".js-mirror-url-hidden[value=\"#{ssh_url}\"]", visible: false)
+
         select 'SSH public key', from: 'Authentication method'
 
         select_direction
diff --git a/spec/fixtures/emails/valid_reply_signed_smime.eml b/spec/fixtures/emails/valid_reply_signed_smime.eml
index 965d922c95..0c5e2c439a 100644
--- a/spec/fixtures/emails/valid_reply_signed_smime.eml
+++ b/spec/fixtures/emails/valid_reply_signed_smime.eml
@@ -1,294 +1,294 @@
-User-Agent: Microsoft-MacOutlook/10.22.0.200209
-Date: Mon, 17 Feb 2020 22:56:47 +0100
-Subject: Re: htmltest | test issue (#1)
-From: "Louzan Martinez, Diego (ext) (SI BP R&D ZG)"
- <diego.louzan.ext@siemens.com>
-To: Administrator / htmltest
- <dlouzan.dummy+c034670b1623e617e15a3df64223d363@gmail.com>
-Message-ID: <012E37D9-2A3F-4AC8-B79A-871F42914D86@siemens.com>
-Thread-Topic: htmltest | test issue (#1)
-References: <reply-c034670b1623e617e15a3df64223d363@169.254.169.254>
- <issue_451@169.254.169.254>
- <note_1797@169.254.169.254>
-In-Reply-To: <note_1797@169.254.169.254>
-Content-type: multipart/signed;
-	protocol="application/pkcs7-signature";
-	micalg=sha256;
-	boundary="B_3664825007_1904734766"
-MIME-Version: 1.0
-
---B_3664825007_1904734766
-Content-type: multipart/mixed;
-	boundary="B_3664825007_384940722"
-
-
---B_3664825007_384940722
-Content-type: multipart/alternative;
-	boundary="B_3664825007_1519466360"
-
-
---B_3664825007_1519466360
-Content-type: text/plain;
-	charset="UTF-8"
-Content-transfer-encoding: quoted-printable
-
-Me too, with an attachment
-
-=20
-
-From: Administrator <dlouzan.dummy@gmail.com>
-Reply to: Administrator / htmltest <dlouzan.dummy+c034670b1623e617e15a3df64=
-223d363@gmail.com>
-Date: Monday, 17 February 2020 at 22:55
-To: "Louzan Martinez, Diego (ext) (SOP IT STG XS)" <diego.louzan.ext@siemen=
-s.com>
-Subject: Re: htmltest | test issue (#1)
-
-=20
-
-Administrator commented:=20
-
-I pity the foo !!!
-
-=E2=80=94=20
-Reply to this email directly or view it on GitLab.=20
-You're receiving this email because of your account on 169.254.169.254. If =
-you'd like to receive fewer emails, you can unsubscribe from this thread or =
-adjust your notification settings.=20
-
-
---B_3664825007_1519466360
-Content-type: text/html;
-	charset="UTF-8"
-Content-transfer-encoding: quoted-printable
-
-<html xmlns:o=3D"urn:schemas-microsoft-com:office:office" xmlns:w=3D"urn:schema=
-s-microsoft-com:office:word" xmlns:m=3D"http://schemas.microsoft.com/office/20=
-04/12/omml" xmlns=3D"http://www.w3.org/TR/REC-html40"><head><meta http-equiv=3DC=
-ontent-Type content=3D"text/html; charset=3Dutf-8"><meta name=3DGenerator content=3D=
-"Microsoft Word 15 (filtered medium)"><title>GitLab</title><style><!--
-/* Font Definitions */
-@font-face
-	{font-family:"Cambria Math";
-	panose-1:2 4 5 3 5 4 6 3 2 4;}
-@font-face
-	{font-family:Calibri;
-	panose-1:2 15 5 2 2 2 4 3 2 4;}
-/* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{margin:0cm;
-	margin-bottom:.0001pt;
-	font-size:11.0pt;
-	font-family:"Calibri",sans-serif;}
-a:link, span.MsoHyperlink
-	{mso-style-priority:99;
-	color:blue;
-	text-decoration:underline;}
-span.EmailStyle19
-	{mso-style-type:personal-reply;
-	font-family:"Calibri",sans-serif;
-	color:windowtext;}
-.MsoChpDefault
-	{mso-style-type:export-only;
-	font-size:10.0pt;}
-@page WordSection1
-	{size:612.0pt 792.0pt;
-	margin:72.0pt 72.0pt 72.0pt 72.0pt;}
-div.WordSection1
-	{page:WordSection1;}
---></style></head><body lang=3Den-ES link=3Dblue vlink=3Dpurple><div class=3DWordSe=
-ction1><p class=3DMsoNormal><span lang=3DEN-US style=3D'mso-fareast-language:EN-US=
-'>Me too, with an attachment<o:p></o:p></span></p><p class=3DMsoNormal><span s=
-tyle=3D'mso-fareast-language:EN-US'><o:p>&nbsp;</o:p></span></p><div style=3D'bo=
-rder:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=
-=3DMsoNormal><b><span style=3D'font-size:12.0pt;color:black'>From: </span></b><s=
-pan style=3D'font-size:12.0pt;color:black'>Administrator &lt;dlouzan.dummy@gma=
-il.com&gt;<br><b>Reply to: </b>Administrator / htmltest &lt;dlouzan.dummy+c0=
-34670b1623e617e15a3df64223d363@gmail.com&gt;<br><b>Date: </b>Monday, 17 Febr=
-uary 2020 at 22:55<br><b>To: </b>&quot;Louzan Martinez, Diego (ext) (SOP IT =
-STG XS)&quot; &lt;diego.louzan.ext@siemens.com&gt;<br><b>Subject: </b>Re: ht=
-mltest | test issue (#1)<o:p></o:p></span></p></div><div><p class=3DMsoNormal>=
-<o:p>&nbsp;</o:p></p></div><div><p><span style=3D'color:#777777'><a href=3D"http=
-://localhost:3000/root">Administrator</a> commented: <o:p></o:p></span></p><=
-div><p>I pity the foo !!!<o:p></o:p></p></div></div><div style=3D'margin-top:7=
-.5pt'><p><span style=3D'font-size:12.0pt;color:#777777'>=E2=80=94 <br>Reply to this =
-email directly or <a href=3D"http://localhost:3000/root/htmltest/issues/1#note=
-_1797">view it on GitLab</a>. <br>You're receiving this email because of you=
-r account on 169.254.169.254. If you'd like to receive fewer emails, you can=
- <a href=3D"http://localhost:3000/sent_notifications/c034670b1623e617e15a3df64=
-223d363/unsubscribe">unsubscribe</a> from this thread or adjust your notific=
-ation settings. <o:p></o:p></span></p></div></div></body></html>
-
---B_3664825007_1519466360--
-
-
---B_3664825007_384940722
-Content-type: image/png; name="gitlab_logo.png";
- x-mac-creator="4F50494D";
- x-mac-type="504E4766"
-Content-disposition: attachment;
-	filename="gitlab_logo.png"
-Content-transfer-encoding: base64
-
-
-iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAABnRSTlMA/wD/AP83WBt9AAAN
-1UlEQVR4AexcZXPjSBTcXxOTvMy7xxfGZWaGaJmZmZmZmZmZmdnMzB7JNwv1qs6VOJY0tuWU
-p/rz5PW0q0f99JQakcxK6eItQGZlBMgIkFkZATICZFZGgIwAmZURICMAshitiybrexXblk5D
-NnOk2i3G6bCvmYcJWuaMCevVohPAsWGx6h/Zd/wrd2xbWf0EcB3YqsqmfnK0LZseYZCIBEBW
-E/5p4Mp+wtCvJWO3Vqufv8dtHNoZCOo6ZYd1ahEJ4LtzRZ1fC+pTF9T1P7hZnQQIvHqiKW0I
-BFU5lPfiCREJYFs5C4r7Cfu6BdVJAOeutVEErfPGRRhGFAIgu1Xft0VUfYaBbRmXI1ItFuvz
-Gkd0jyKo65oXNupEIYD//g11QZ2o+tRF9QJP7lUPAYJvX2haNIkmmKv0Xj0rCgHsa+dDWRgA
-x+al1eT5Z9+mCglaF02KsGyKBWCcdsOA1hXWZ6A7MB5X2vtPwG8a07tCgvoehchsSLEA/sd3
-sNtUWJ+mpEHgxaN0FyD08Y2mVbMKCarzavluXkyxAI5NS3AplcG5fVXa+8+h7TEI4kSWSgEY
-t9NQ3j5GfcZhXRivJ439JxgwT+gfg6C+dymymlMmQOD5Q01xgxj1acoaBV8/S2P/+fJe2+b3
-GATV+bV9d6+lTADc88FFxIZz9/r0FcB9fE+VBO2r56RGAMYL7ZFYMI3qwfp9aek/oZB5Snks
-dtD4cthSIEDw1VNNaaMq69O0bBp8/yot/Uf1Wdv+zyoJqgvr+h/eSoEAzl3roIjYcB3Yko4C
-eE4fxK31eAja1y9MogDQHhnZPU4BTGP74jiTZv6DwpYZw+MkaBgEja9kCRB89xLaI1VC27p5
-6NPb9BIgrP2m6/hP1eyg8fX0XlIFcO3fHE9lAPeRnWnmP+ePqbIV8RN0bF6WHAGgPdKHkwDm
-iQPZUDB9XoAhy5zRnAga6Y78Gl81SLVHYkPb9o/Q149p4z96ja5LDieCmpKG0PhKuACuwzvi
-rwze1LtP7EsXAbyXT6lylFw5OnesTrQA0B4ZwLU4DPPUIWw4lA4PQIx1wQQeBI3Du7JeT8IF
-CH35AO0RTtC2/yus/hIR/UImva5bPg+CmrLGwTfPEi6A+/heiCfckK3wnD0sfgF818+rc2ty
-ogZw7tmQWAHYMG6P0FzLAlhmjoggJG7/YW1LpvImaBrVk2vjqwb39shfvOvTdfo3rFOJ2n8s
-Jn3PYn7soPGVQAE8Zw6B//BBNp5nOi5q/7l9GSbM+AFPMCZKAGiPCIF13liYZxLhsq2YJZCg
-aVxfNhggLgC0R/7lXxzMMxm0IvUfu0Xfp0wAO2h8vUuIAJ4L0B7hD3UOnmc6I04BYMJMINxH
-d5EVANojY/jWRH6eifyCCTPBME8aBI0vYgKEDbg9kkukPphnEtWCCTPhgMYXSQG8V05De0Qg
-1Hk1YZ5JFAsmzArrCWUHja+T+4kKwLLWhRPJFAfzTCJbjo2LCRI0T8ONrzAJAaA90r2AYH36
-3iUwz5TiBRNmg9sTJKjt8HdY/ZWYAL4bvNsjMeaZropHgMDzB5ri+gQJQuOLiACsbSm0R4jB
-vmqOiPxn6wriBC2zRkYQIiAAfIBHFnr4kE9kH+CRAIcP+Wpw/QCPBGCe6aYYP8AjBfiQj78A
-0B75W5YIiORDPufOtQkiaJkLH/LxFYB1W22j2xjL5MaWSsIoU9iGt/LfuYQbAKnEvau2cZ0S
-RNBKFzE2vTABtNfDKxqEh8jC5VLyoBWmdnVVubXUeamBKremsXXdULkiIezwoS2uy349I0gA
-5uFctD0LzaFQuQSVZxEGneXoitM1vGBIAeydlYgGakQxk0Lbspg7EyIsy1eAgJ051RLtyEJb
-ZWiyAg0mX6W/P6XJU6Tq9NW5Cl9fCtGkeeGDmqBAW+Tfj+5YXsRr4CkAq7+N9tT+vsvOLLRB
-gcbIiWsQLpdhu1T9nRoBDKXK0GAZ+d/+KBlap8CH9v3odilY1QWeAjBPFuEtMH5psJJCw6Sk
-XUji6FozVS5k61STvP8MlaLlFNopgaNj7k3lJUDQyZxp82MLgAQtpAhXTKfMhdQ5Ci95/5Gg
-eRTaIf3fuZ0oivhMnAVgjffR3rq/tgBsl6EZFHEXMpSlwIX0JeT8B6x/Kr54ZdGHtlvJaq5w
-FoB5tvx/u4ARbZaj8UQvZFpi71wzBf7TkZD/wOmPlaONv6w/CsyDWRwFCLmZcx2iNwIN1lJo
-pIygC/n6UfiBJNn+04eo/wyXodUUnH4UmFOlEb+VgwCs6THaVz96IwC+YZZSaCixCzmUdBfS
-F2P/kRM7/SEStBgu3oqwpxaru8lBAObFmkr2AkghnaWjC1k7EPQfyffMtV0a+8SYR/PjFiDs
-ZS50jb3dr3Q2RfBlAC7Ul8K2kCT/yVZ4euMATMj6J/7KXLHBnG6Fg21cArCW52h/w9jbEU9n
-+IFEX6pMjgC6YmVwkJxQ5pKj9XDxxsSe2qzhbnwCvNpY9XagwSoK3z9EXMjWMSku9LfM2h78
-h3Dmig3myZI4BAj7mYs9q9yLfDqjs7x9kuFC6my5pxcJ/6GjM1eVYM62iwRdVQjA2t6gA405
-CEAuneHHEhyOEu4/RRQR/4HMxQF767LGh1UJ8GY7t00hnU0QfCHTEmuiXQi/pWoH/iMsc20C
-6+cA5vmqmAIgP3OlP8dNIZ0phKYzOsvTR6nmMP/La2ZNuP+MgMzFGcz5zpGQq1IBWOsrdLA5
-530hnS0TkM7AhYqVCfSfQuw/ClKZiw/2N2QN9ysVgHm5Hu2EW4UHpGiusHRGS3BEgkhM3H/M
-bbH/SAVlrlmQuXiCebygcgHOdeSxI5l0Bi7UG7uQPEH+4+oJ/kMoc/HAiaJKBYh+/uF3GWwU
-lM7wIwp+UEmEANoCKjBQQThz8cBuZeUCHPqdx46E0xktsbQj6kLgP214+Q9krhX8rT/qYbRy
-C7oxXOjukM4W8U1ndBZ+UFFly8n7Tw++/oOJzIfMJRTMpd6VCsBanqFjuWQ0wDfVTIq/CxVS
-IvKfaZC5BOPwn6z+Tswgpr+DTpaS+WNb+KYzWkrWhfBWptY18bAUn4t3HM5cckHWDzieD+8m
-Y7ajXd+Ym6PQLorAZbCOYzoDF+qpxKZB0H+c3fEFwCtzraEInP4uOXOtnHV8iPuVZNiLexI8
-QhmpdBYcqNCScyFNPhUYoOCeuaRoCYmLd39j9uW6SMjNdS6IZY0PfiQDgRVI0Tzu6YyWmtsI
-diHwn1ZK7v4jQbMFZS54D/P9ZSTL8B1P9xmZBzN+zcfxxjbZ997hYG4u5OpByoXkzm5KRHO0
-/kmCM9du5ffBUI9W8CdKTJD9fBQd/VdoOhvLLZ0FsAsVUAT8J4/y9+foP6MFZ67Df7Dv90aQ
-n8AHGvCegLncD+2U8ddgNdd0JjW3FuxCf+PZU+w/XP7uMGGZa6eUudCNNT9NwL+rCTq+T2vt
-ayAonQ2RcHCh7sJdSI5nTxGd8MwFKff79IPfkrB/WcYiVn0ZnSxJTjrDjy7afEqY/yjw7Cmi
-k5K5juex/7V3Dz5yhVEUwP+cce2GjWu7cW3btm03qm27QRXVtt2ZbO8op/r2vp7qS+a+uHHP
-5r7z252ze2N7UUrZZxMB0FBw6GxQUJ1JdXlEXSHcn3oB7g/MFSPN5a75fyEAQGG5QIHUWe9I
-wCskBYa4Qrg/rfADSNZces1Poeb/swAoKEBnM4Lq7H372B32Ct2RAUxb3B/KXHzN/wcBcFCA
-zor92sQVIic01eTzprg/pLn0mn/Hgz/mKVC4moECobMgV4gd8snnTfWM5fTL/G1ZlK75HgTA
-QUGu7eJAOhNG6RMaboDXKWOuhTAXUfM9CICGAnTGD/m4AR7MNQunn6j5HgTAQgEv5CnQGTHk
-IwZ4MNfE+C80iE2o+Z4GgBTSUOgFKKg6G41vl5JDPmKANyKAuVDzO6HmexAAAQVSZxjy1cMV
-ogd4OP0yc1uimgs1Hx9n8zIAHgp4GSwQnUWZCQ0xwBNzzYO5yJrvfwCAwmmBQklGZ8SQDwM8
-t7mm4cVL1HzvA+ChEE5OcOoMc2JqgAdzjcU3O4ma70EAPBQup/a3cUEBOhse168QMcCDuSLB
-aj7xu329CICHAnTWHzrThnz6AA//+30VcxE1388AeChAZz0jxJAPAzynuYia738AxPPqRgYK
-sWJ1Fv7xCgmvlAHMtwM8mGsSzKXW/AIIQIUCdKYP+fQBnkzYVkQcNb8ian5hBQAoNMPX5nc6
-Gwyd6UM+DPB0cyk1vwACUKAAnfWJ6kO+YgZ4vcRcePHqNb9gAlCggJfBTPyaLveQzzHA6wZz
-OWu+BaBAATpThnx3McBzmctR8y0ABQrQmXvIhwGe21zrSqfOjUfNtwB0KEBnUegsN+SLOQd4
-MJde8y0ARwqAQj6DudBZZsiXcA5gekSSs2EureZbAAoUquKFPDWns++HfBjgwVyo+RfmoeZb
-ADQUcjobk9HZN0M+DPBgLtT8I0TNtwDcUFiW0dm3Qz7cn4E5c2Vq/gCm5lsAChSgs+wVwgAP
-5krX/LV8zbcAFCisjiRnxpI9wrkhX3qAlxCsibnYD+1YAAQUJkQ/dozL8ZEBzIf28eTYaHJt
-Ga7mWwAEFPalNtdNDo89bphIfwBdzLWhBlnzLQD+JwoH+7/qVvFlpwqpPT34mm8B8M/n15+P
-Lf90cGHRpxf4RwvAHt8DsMcCsADssQAsAHssAAvAni8AV5380akCdgAAAABJRU5ErkJggg==
---B_3664825007_384940722--
-
---B_3664825007_1904734766
-Content-type: application/pkcs7-signature; name="smime.p7s"
-Content-transfer-encoding: base64
-Content-disposition: attachment;
-	filename="smime.p7s"
-
-MIIRpwYJKoZIhvcNAQcCoIIRmDCCEZQCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0B
-BwGggg8VMIIHojCCBYqgAwIBAgIEZ5a6PTANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMC
-REUxDzANBgNVBAgMBkJheWVybjERMA8GA1UEBwwITXVlbmNoZW4xEDAOBgNVBAoMB1NpZW1l
-bnMxETAPBgNVBAUTCFpaWlpaWkE2MR0wGwYDVQQLDBRTaWVtZW5zIFRydXN0IENlbnRlcjE/
-MD0GA1UEAww2U2llbWVucyBJc3N1aW5nIENBIE1lZGl1bSBTdHJlbmd0aCBBdXRoZW50aWNh
-dGlvbiAyMDE2MB4XDTE5MTEyMTE0NDQ0N1oXDTIwMTEyMTE0NDQ0N1owdzERMA8GA1UEBRMI
-WjAwM0gwOFQxDjAMBgNVBCoMBURpZWdvMRgwFgYDVQQEDA9Mb3V6YW4gTWFydGluZXoxGDAW
-BgNVBAoMD1NpZW1lbnMtUGFydG5lcjEeMBwGA1UEAwwVTG91emFuIE1hcnRpbmV6IERpZWdv
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuInpNaC7NRYD+0pOpHDz2pk9xmPt
-JGj860SF6Nmn6Eu9EMYKEDfneC6z5QcH+mPS2d0VWgqVVGbRXSPsxJtbi9TCWjQUZdHglEZK
-z9zxoFDh2dvW5/+TOT5Jf78FXyqak0YtY6+oMjQ/i9RUqPL7sIlyXLrBYrILzQ9Afo+7bXZg
-v3ypp6xtqAV2ctHzQWFi0onJzxLVYguiVb7fFF9rBEMvSZonuw5tvOwJIhbe5FDFOrDcfbyU
-ofZ/wikIZ+A+CE5GryXuuQmGxJaC2QqOkRAWQDzLDx9nG+rKiEs5OvlfEZC7EV1PyjZ93coM
-faCVdlAgcFZ5fvd37CjyjKl+1QIDAQABo4IC9DCCAvAwggEEBggrBgEFBQcBAQSB9zCB9DAy
-BggrBgEFBQcwAoYmaHR0cDovL2FoLnNpZW1lbnMuY29tL3BraT9aWlpaWlpBNi5jcnQwQQYI
-KwYBBQUHMAKGNWxkYXA6Ly9hbC5zaWVtZW5zLm5ldC9DTj1aWlpaWlpBNixMPVBLST9jQUNl
-cnRpZmljYXRlMEkGCCsGAQUFBzAChj1sZGFwOi8vYWwuc2llbWVucy5jb20vQ049WlpaWlpa
-QTYsbz1UcnVzdGNlbnRlcj9jQUNlcnRpZmljYXRlMDAGCCsGAQUFBzABhiRodHRwOi8vb2Nz
-cC5wa2ktc2VydmljZXMuc2llbWVucy5jb20wHwYDVR0jBBgwFoAU+BVdRwxsd3tyxAIXkWii
-tvdqCUQwDAYDVR0TAQH/BAIwADBFBgNVHSAEPjA8MDoGDSsGAQQBoWkHAgIEAQMwKTAnBggr
-BgEFBQcCARYbaHR0cDovL3d3dy5zaWVtZW5zLmNvbS9wa2kvMIHKBgNVHR8EgcIwgb8wgbyg
-gbmggbaGJmh0dHA6Ly9jaC5zaWVtZW5zLmNvbS9wa2k/WlpaWlpaQTYuY3JshkFsZGFwOi8v
-Y2wuc2llbWVucy5uZXQvQ049WlpaWlpaQTYsTD1QS0k/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdIZJbGRhcDovL2NsLnNpZW1lbnMuY29tL0NOPVpaWlpaWkE2LG89VHJ1c3RjZW50ZXI/
-Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDgYDVR0PAQH/BAQDAgeAMFUGA1UdEQROMEygLAYKKwYBBAGCNxQCA6AeDBxkaWVnby5s
-b3V6YW4uZXh0QHNpZW1lbnMuY29tgRxkaWVnby5sb3V6YW4uZXh0QHNpZW1lbnMuY29tMB0G
-A1UdDgQWBBQj8k8aqZey68w8ALYKGJSGMt5hZDANBgkqhkiG9w0BAQsFAAOCAgEAFDHqxpb1
-R9cB4noC9vx09bkNbmXCpVfl3XCQUmAWTznC0nwEssTTjo0PWuIV4C3jnsp0MRUeHZ6lsyhZ
-OzS1ETwYgvj6wzjb8RF3wgn7N/JOvFGaErMz5HZpKOfzGiNpW6/Rmd4hsRDjAwOVQOXUTqc/
-0Bj3FMoLRCSWSnTp5HdyvrY2xOKHfTrTjzmcLdFaKE2F5n7+dBkwCKVfzut8CqfVq/I7ks4m
-D1IHk93/P6l9U34R2FHPt6zRTNZcWmDirRSlMH4L18CnfiNPuDN/PtRYlt3Vng5EdYN0VCg2
-NM/uees0U4ingCb0NFjg66uQ/tjfPQk55MN4Wpls4N6TkMoTCWLiqZzYTGdmVQexzroL6940
-tmMr8LoN3TpPf0OdvdKEpyH7fzsx5QlmQyywIWec6X+Fx6+l0g91VJnPEtqACpfZIBZtviHl
-gfX298w+SsvBK8C48Pqs8Ijh7tLrCxx7VMLVHZqwWWPK53ga+CDWmjoSQPxi+CPZF7kao6N5
-4GrJWwSHlHh6WzTbLyLvTJZZ775Utp4W8s8xMUsQJ413iYzEaC8FcSeNjSk5UiDDiHrKmzpM
-tbApD3pUXStblUMKYGTG1Mj9BcEBFkCdoGlw/ulszIrKFfOyRNDG3Ay+Dj/oMjoKsJphu3px
-wyft82rTer7UW/I7o0h0DAG4lkMwggdrMIIFU6ADAgECAgR5nlqfMA0GCSqGSIb3DQEBCwUA
-MIGeMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQ
-MA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTMxHTAbBgNVBAsMFFNpZW1lbnMg
-VHJ1c3QgQ2VudGVyMScwJQYDVQQDDB5TaWVtZW5zIElzc3VpbmcgQ0EgRUUgRW5jIDIwMTYw
-HhcNMTkwOTI3MDgwMTM5WhcNMjAwOTI3MDgwMTM3WjB3MREwDwYDVQQFEwhaMDAzSDA4VDEO
-MAwGA1UEKgwFRGllZ28xGDAWBgNVBAQMD0xvdXphbiBNYXJ0aW5lejEYMBYGA1UECgwPU2ll
-bWVucy1QYXJ0bmVyMR4wHAYDVQQDDBVMb3V6YW4gTWFydGluZXogRGllZ28wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyby5qKzZIrGYWRqxnaAyMt/a/uc0uMk0F3MjwxvPM
-vh5DllUpqx0l8ZDakDjPhlEXTeoL4DHNgmh+CDCs76CppM3cNG/1W1Ajo/L2iwMoXaxYuQ/F
-q7ED+02KEkWX2DDVVG3fhrUGP20QAq77xPDptmVWZnUnuobZBNYkC49Xfl9HJvkJL8P0+Jqb
-Eae7p4roiEr7wNkGriwrVXgA3oPNF/W+OuI76JTNTajS/6PAK/GeqIvLjfuBXpdBZTY031nE
-Cztca8vI1jUjQzVhS+0dWpvpfhkVumbvOnid8DI9lapYsX8dpZFsa3ya+T3tjUdGSOOKi0kg
-lWf/XYyyfhmDAgMBAAGjggLVMIIC0TAdBgNVHQ4EFgQUprhTCDwNLfPImpSfWdq+QvPTo9Mw
-JwYDVR0RBCAwHoEcZGllZ28ubG91emFuLmV4dEBzaWVtZW5zLmNvbTAOBgNVHQ8BAf8EBAMC
-BDAwLAYDVR0lBCUwIwYIKwYBBQUHAwQGCisGAQQBgjcKAwQGCysGAQQBgjcKAwQBMIHKBgNV
-HR8EgcIwgb8wgbyggbmggbaGJmh0dHA6Ly9jaC5zaWVtZW5zLmNvbS9wa2k/WlpaWlpaQTMu
-Y3JshkFsZGFwOi8vY2wuc2llbWVucy5uZXQvQ049WlpaWlpaQTMsTD1QS0k/Y2VydGlmaWNh
-dGVSZXZvY2F0aW9uTGlzdIZJbGRhcDovL2NsLnNpZW1lbnMuY29tL0NOPVpaWlpaWkEzLG89
-VHJ1c3RjZW50ZXI/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDBFBgNVHSAEPjA8MDoGDSsG
-AQQBoWkHAgIEAQMwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5zaWVtZW5zLmNvbS9wa2kv
-MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUoassbqB68NPCTeof8R4hivwMre8wggEEBggr
-BgEFBQcBAQSB9zCB9DAyBggrBgEFBQcwAoYmaHR0cDovL2FoLnNpZW1lbnMuY29tL3BraT9a
-WlpaWlpBMy5jcnQwQQYIKwYBBQUHMAKGNWxkYXA6Ly9hbC5zaWVtZW5zLm5ldC9DTj1aWlpa
-WlpBMyxMPVBLST9jQUNlcnRpZmljYXRlMEkGCCsGAQUFBzAChj1sZGFwOi8vYWwuc2llbWVu
-cy5jb20vQ049WlpaWlpaQTMsbz1UcnVzdGNlbnRlcj9jQUNlcnRpZmljYXRlMDAGCCsGAQUF
-BzABhiRodHRwOi8vb2NzcC5wa2ktc2VydmljZXMuc2llbWVucy5jb20wDQYJKoZIhvcNAQEL
-BQADggIBAF98ZMNg28LgkwdjOdvOGbC1QitsWjZTyotmQESF0nClDLUhb0O5675vVixntbrf
-eB8xy1+KRiadk40GnAIJ0YzmNl4Tav6hPYv9VBWe5olsWG7C4qB3Q/SwhvW/e+owxv1cBra8
-R3oRudiN81eTZQHyNghRephVqQG/dpPYqydoANfIhEpHa79QlpaCAeYl4896AZOS8HYbkDFs
-hLdv7sEHtl79YuSWI1wBjbJl70c0Sb4wLRgCPuHyQj2Uw/vQ5xJlEvBDZAIXXe1TP/nqiuY6
-7nweJbbeqfFE6ZP3kCe+mEIWGSaO0iThZyLGer8fHs1XiEmhhPgvC7P7KodzpXU6+hX+ZzbD
-DxEjFfetV5sh0aNSXG9xx4hZmS9bpImBGR8MvZ7cgxqItvLtY2xvfUbYW244d4RcWesaCDq3
-ZEIo6uCIzOzJAwjUdLIac+lLV0rxiHmb7O3cQ19kjpWDB31hmfrus/TKJ55pBKVWBX5m/mFv
-K8Ep5USpGrNS0EzOP7I1kQZv2VsvAhSxk/m5FMLpDy8T0O8YgbLypTXoeJFWCF6RduSjVsaZ
-lkAtTQYud683pjyOMxJXaQUYGU1PmEYSOonMkVsT9aBcxYkXLp+Ln/+8G0OCYu7dRdwnj+Ut
-7yR/ltxtgDcaFApCb0qBTKbgbqZk1fASmkOp+kbdYmoUMYICVjCCAlICAQEwgb8wgbYxCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIDAZCYXllcm4xETAPBgNVBAcMCE11ZW5jaGVuMRAwDgYDVQQK
-DAdTaWVtZW5zMREwDwYDVQQFEwhaWlpaWlpBNjEdMBsGA1UECwwUU2llbWVucyBUcnVzdCBD
-ZW50ZXIxPzA9BgNVBAMMNlNpZW1lbnMgSXNzdWluZyBDQSBNZWRpdW0gU3RyZW5ndGggQXV0
-aGVudGljYXRpb24gMjAxNgIEZ5a6PTANBglghkgBZQMEAgEFAKBpMC8GCSqGSIb3DQEJBDEi
-BCAOR58AbNfSrI+vtMs+dgAQtn3IVZ3RjYC5hz3j9k+6TTAYBgkqhkiG9w0BCQMxCwYJKoZI
-hvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDAyMTcyMTU2NDdaMA0GCSqGSIb3DQEBAQUABIIB
-AHLSBcFHhNHPevbwqvA2ecuVb/aKnj45CFF6l8esP1H5DRm1ee5qMKuIS84NFuFC9RUENNhW
-DBzsB+BVGz64o1f8QgIklYVrIJ4JZ0q1abNG7NbkVKWIpS3CQo//YWShUTYg+JpKx4YbahGR
-sP5zbufbU4eagrrqBChjPTLy+njdjwCNu0XPykBTKOOf6BMjnS33AYjHJyh83JOY7rw3IDLx
-8POQH4g5EMRpl9354s0rEkIezMt7pfUAsqY3QnQ8hvlE4KTikPQ+tvLMK1l/ffcLAP8BdBNI
-YA3ikb3qCoGNSLKieYzNnBPhNOIJELUtEEaljAFZYMQzMKCbI4JdiDs=
-
---B_3664825007_1904734766--
+User-Agent: Microsoft-MacOutlook/10.22.0.200209
+Date: Mon, 17 Feb 2020 22:56:47 +0100
+Subject: Re: htmltest | test issue (#1)
+From: "Louzan Martinez, Diego (ext) (SI BP R&D ZG)"
+ <diego.louzan.ext@siemens.com>
+To: Administrator / htmltest
+ <dlouzan.dummy+c034670b1623e617e15a3df64223d363@gmail.com>
+Message-ID: <012E37D9-2A3F-4AC8-B79A-871F42914D86@siemens.com>
+Thread-Topic: htmltest | test issue (#1)
+References: <reply-c034670b1623e617e15a3df64223d363@169.254.169.254>
+ <issue_451@169.254.169.254>
+ <note_1797@169.254.169.254>
+In-Reply-To: <note_1797@169.254.169.254>
+Content-type: multipart/signed;
+	protocol="application/pkcs7-signature";
+	micalg=sha256;
+	boundary="B_3664825007_1904734766"
+MIME-Version: 1.0
+
+--B_3664825007_1904734766
+Content-type: multipart/mixed;
+	boundary="B_3664825007_384940722"
+
+
+--B_3664825007_384940722
+Content-type: multipart/alternative;
+	boundary="B_3664825007_1519466360"
+
+
+--B_3664825007_1519466360
+Content-type: text/plain;
+	charset="UTF-8"
+Content-transfer-encoding: quoted-printable
+
+Me too, with an attachment
+
+=20
+
+From: Administrator <dlouzan.dummy@gmail.com>
+Reply to: Administrator / htmltest <dlouzan.dummy+c034670b1623e617e15a3df64=
+223d363@gmail.com>
+Date: Monday, 17 February 2020 at 22:55
+To: "Louzan Martinez, Diego (ext) (SOP IT STG XS)" <diego.louzan.ext@siemen=
+s.com>
+Subject: Re: htmltest | test issue (#1)
+
+=20
+
+Administrator commented:=20
+
+I pity the foo !!!
+
+=E2=80=94=20
+Reply to this email directly or view it on GitLab.=20
+You're receiving this email because of your account on 169.254.169.254. If =
+you'd like to receive fewer emails, you can unsubscribe from this thread or =
+adjust your notification settings.=20
+
+
+--B_3664825007_1519466360
+Content-type: text/html;
+	charset="UTF-8"
+Content-transfer-encoding: quoted-printable
+
+<html xmlns:o=3D"urn:schemas-microsoft-com:office:office" xmlns:w=3D"urn:schema=
+s-microsoft-com:office:word" xmlns:m=3D"http://schemas.microsoft.com/office/20=
+04/12/omml" xmlns=3D"http://www.w3.org/TR/REC-html40"><head><meta http-equiv=3DC=
+ontent-Type content=3D"text/html; charset=3Dutf-8"><meta name=3DGenerator content=3D=
+"Microsoft Word 15 (filtered medium)"><title>GitLab</title><style><!--
+/* Font Definitions */
+@font-face
+	{font-family:"Cambria Math";
+	panose-1:2 4 5 3 5 4 6 3 2 4;}
+@font-face
+	{font-family:Calibri;
+	panose-1:2 15 5 2 2 2 4 3 2 4;}
+/* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{margin:0cm;
+	margin-bottom:.0001pt;
+	font-size:11.0pt;
+	font-family:"Calibri",sans-serif;}
+a:link, span.MsoHyperlink
+	{mso-style-priority:99;
+	color:blue;
+	text-decoration:underline;}
+span.EmailStyle19
+	{mso-style-type:personal-reply;
+	font-family:"Calibri",sans-serif;
+	color:windowtext;}
+.MsoChpDefault
+	{mso-style-type:export-only;
+	font-size:10.0pt;}
+@page WordSection1
+	{size:612.0pt 792.0pt;
+	margin:72.0pt 72.0pt 72.0pt 72.0pt;}
+div.WordSection1
+	{page:WordSection1;}
+--></style></head><body lang=3Den-ES link=3Dblue vlink=3Dpurple><div class=3DWordSe=
+ction1><p class=3DMsoNormal><span lang=3DEN-US style=3D'mso-fareast-language:EN-US=
+'>Me too, with an attachment<o:p></o:p></span></p><p class=3DMsoNormal><span s=
+tyle=3D'mso-fareast-language:EN-US'><o:p>&nbsp;</o:p></span></p><div style=3D'bo=
+rder:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=
+=3DMsoNormal><b><span style=3D'font-size:12.0pt;color:black'>From: </span></b><s=
+pan style=3D'font-size:12.0pt;color:black'>Administrator &lt;dlouzan.dummy@gma=
+il.com&gt;<br><b>Reply to: </b>Administrator / htmltest &lt;dlouzan.dummy+c0=
+34670b1623e617e15a3df64223d363@gmail.com&gt;<br><b>Date: </b>Monday, 17 Febr=
+uary 2020 at 22:55<br><b>To: </b>&quot;Louzan Martinez, Diego (ext) (SOP IT =
+STG XS)&quot; &lt;diego.louzan.ext@siemens.com&gt;<br><b>Subject: </b>Re: ht=
+mltest | test issue (#1)<o:p></o:p></span></p></div><div><p class=3DMsoNormal>=
+<o:p>&nbsp;</o:p></p></div><div><p><span style=3D'color:#777777'><a href=3D"http=
+://localhost:3000/root">Administrator</a> commented: <o:p></o:p></span></p><=
+div><p>I pity the foo !!!<o:p></o:p></p></div></div><div style=3D'margin-top:7=
+.5pt'><p><span style=3D'font-size:12.0pt;color:#777777'>=E2=80=94 <br>Reply to this =
+email directly or <a href=3D"http://localhost:3000/root/htmltest/issues/1#note=
+_1797">view it on GitLab</a>. <br>You're receiving this email because of you=
+r account on 169.254.169.254. If you'd like to receive fewer emails, you can=
+ <a href=3D"http://localhost:3000/sent_notifications/c034670b1623e617e15a3df64=
+223d363/unsubscribe">unsubscribe</a> from this thread or adjust your notific=
+ation settings. <o:p></o:p></span></p></div></div></body></html>
+
+--B_3664825007_1519466360--
+
+
+--B_3664825007_384940722
+Content-type: image/png; name="gitlab_logo.png";
+ x-mac-creator="4F50494D";
+ x-mac-type="504E4766"
+Content-disposition: attachment;
+	filename="gitlab_logo.png"
+Content-transfer-encoding: base64
+
+
+iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAABnRSTlMA/wD/AP83WBt9AAAN
+1UlEQVR4AexcZXPjSBTcXxOTvMy7xxfGZWaGaJmZmZmZmZmZmdnMzB7JNwv1qs6VOJY0tuWU
+p/rz5PW0q0f99JQakcxK6eItQGZlBMgIkFkZATICZFZGgIwAmZURICMAshitiybrexXblk5D
+NnOk2i3G6bCvmYcJWuaMCevVohPAsWGx6h/Zd/wrd2xbWf0EcB3YqsqmfnK0LZseYZCIBEBW
+E/5p4Mp+wtCvJWO3Vqufv8dtHNoZCOo6ZYd1ahEJ4LtzRZ1fC+pTF9T1P7hZnQQIvHqiKW0I
+BFU5lPfiCREJYFs5C4r7Cfu6BdVJAOeutVEErfPGRRhGFAIgu1Xft0VUfYaBbRmXI1ItFuvz
+Gkd0jyKo65oXNupEIYD//g11QZ2o+tRF9QJP7lUPAYJvX2haNIkmmKv0Xj0rCgHsa+dDWRgA
+x+al1eT5Z9+mCglaF02KsGyKBWCcdsOA1hXWZ6A7MB5X2vtPwG8a07tCgvoehchsSLEA/sd3
+sNtUWJ+mpEHgxaN0FyD08Y2mVbMKCarzavluXkyxAI5NS3AplcG5fVXa+8+h7TEI4kSWSgEY
+t9NQ3j5GfcZhXRivJ439JxgwT+gfg6C+dymymlMmQOD5Q01xgxj1acoaBV8/S2P/+fJe2+b3
+GATV+bV9d6+lTADc88FFxIZz9/r0FcB9fE+VBO2r56RGAMYL7ZFYMI3qwfp9aek/oZB5Snks
+dtD4cthSIEDw1VNNaaMq69O0bBp8/yot/Uf1Wdv+zyoJqgvr+h/eSoEAzl3roIjYcB3Yko4C
+eE4fxK31eAja1y9MogDQHhnZPU4BTGP74jiTZv6DwpYZw+MkaBgEja9kCRB89xLaI1VC27p5
+6NPb9BIgrP2m6/hP1eyg8fX0XlIFcO3fHE9lAPeRnWnmP+ePqbIV8RN0bF6WHAGgPdKHkwDm
+iQPZUDB9XoAhy5zRnAga6Y78Gl81SLVHYkPb9o/Q149p4z96ja5LDieCmpKG0PhKuACuwzvi
+rwze1LtP7EsXAbyXT6lylFw5OnesTrQA0B4ZwLU4DPPUIWw4lA4PQIx1wQQeBI3Du7JeT8IF
+CH35AO0RTtC2/yus/hIR/UImva5bPg+CmrLGwTfPEi6A+/heiCfckK3wnD0sfgF818+rc2ty
+ogZw7tmQWAHYMG6P0FzLAlhmjoggJG7/YW1LpvImaBrVk2vjqwb39shfvOvTdfo3rFOJ2n8s
+Jn3PYn7soPGVQAE8Zw6B//BBNp5nOi5q/7l9GSbM+AFPMCZKAGiPCIF13liYZxLhsq2YJZCg
+aVxfNhggLgC0R/7lXxzMMxm0IvUfu0Xfp0wAO2h8vUuIAJ4L0B7hD3UOnmc6I04BYMJMINxH
+d5EVANojY/jWRH6eifyCCTPBME8aBI0vYgKEDbg9kkukPphnEtWCCTPhgMYXSQG8V05De0Qg
+1Hk1YZ5JFAsmzArrCWUHja+T+4kKwLLWhRPJFAfzTCJbjo2LCRI0T8ONrzAJAaA90r2AYH36
+3iUwz5TiBRNmg9sTJKjt8HdY/ZWYAL4bvNsjMeaZropHgMDzB5ri+gQJQuOLiACsbSm0R4jB
+vmqOiPxn6wriBC2zRkYQIiAAfIBHFnr4kE9kH+CRAIcP+Wpw/QCPBGCe6aYYP8AjBfiQj78A
+0B75W5YIiORDPufOtQkiaJkLH/LxFYB1W22j2xjL5MaWSsIoU9iGt/LfuYQbAKnEvau2cZ0S
+RNBKFzE2vTABtNfDKxqEh8jC5VLyoBWmdnVVubXUeamBKremsXXdULkiIezwoS2uy349I0gA
+5uFctD0LzaFQuQSVZxEGneXoitM1vGBIAeydlYgGakQxk0Lbspg7EyIsy1eAgJ051RLtyEJb
+ZWiyAg0mX6W/P6XJU6Tq9NW5Cl9fCtGkeeGDmqBAW+Tfj+5YXsRr4CkAq7+N9tT+vsvOLLRB
+gcbIiWsQLpdhu1T9nRoBDKXK0GAZ+d/+KBlap8CH9v3odilY1QWeAjBPFuEtMH5psJJCw6Sk
+XUji6FozVS5k61STvP8MlaLlFNopgaNj7k3lJUDQyZxp82MLgAQtpAhXTKfMhdQ5Ci95/5Gg
+eRTaIf3fuZ0oivhMnAVgjffR3rq/tgBsl6EZFHEXMpSlwIX0JeT8B6x/Kr54ZdGHtlvJaq5w
+FoB5tvx/u4ARbZaj8UQvZFpi71wzBf7TkZD/wOmPlaONv6w/CsyDWRwFCLmZcx2iNwIN1lJo
+pIygC/n6UfiBJNn+04eo/wyXodUUnH4UmFOlEb+VgwCs6THaVz96IwC+YZZSaCixCzmUdBfS
+F2P/kRM7/SEStBgu3oqwpxaru8lBAObFmkr2AkghnaWjC1k7EPQfyffMtV0a+8SYR/PjFiDs
+ZS50jb3dr3Q2RfBlAC7Ul8K2kCT/yVZ4euMATMj6J/7KXLHBnG6Fg21cArCW52h/w9jbEU9n
++IFEX6pMjgC6YmVwkJxQ5pKj9XDxxsSe2qzhbnwCvNpY9XagwSoK3z9EXMjWMSku9LfM2h78
+h3Dmig3myZI4BAj7mYs9q9yLfDqjs7x9kuFC6my5pxcJ/6GjM1eVYM62iwRdVQjA2t6gA405
+CEAuneHHEhyOEu4/RRQR/4HMxQF767LGh1UJ8GY7t00hnU0QfCHTEmuiXQi/pWoH/iMsc20C
+6+cA5vmqmAIgP3OlP8dNIZ0phKYzOsvTR6nmMP/La2ZNuP+MgMzFGcz5zpGQq1IBWOsrdLA5
+530hnS0TkM7AhYqVCfSfQuw/ClKZiw/2N2QN9ysVgHm5Hu2EW4UHpGiusHRGS3BEgkhM3H/M
+bbH/SAVlrlmQuXiCebygcgHOdeSxI5l0Bi7UG7uQPEH+4+oJ/kMoc/HAiaJKBYh+/uF3GWwU
+lM7wIwp+UEmEANoCKjBQQThz8cBuZeUCHPqdx46E0xktsbQj6kLgP214+Q9krhX8rT/qYbRy
+C7oxXOjukM4W8U1ndBZ+UFFly8n7Tw++/oOJzIfMJRTMpd6VCsBanqFjuWQ0wDfVTIq/CxVS
+IvKfaZC5BOPwn6z+Tswgpr+DTpaS+WNb+KYzWkrWhfBWptY18bAUn4t3HM5cckHWDzieD+8m
+Y7ajXd+Ym6PQLorAZbCOYzoDF+qpxKZB0H+c3fEFwCtzraEInP4uOXOtnHV8iPuVZNiLexI8
+QhmpdBYcqNCScyFNPhUYoOCeuaRoCYmLd39j9uW6SMjNdS6IZY0PfiQDgRVI0Tzu6YyWmtsI
+diHwn1ZK7v4jQbMFZS54D/P9ZSTL8B1P9xmZBzN+zcfxxjbZ997hYG4u5OpByoXkzm5KRHO0
+/kmCM9du5ffBUI9W8CdKTJD9fBQd/VdoOhvLLZ0FsAsVUAT8J4/y9+foP6MFZ67Df7Dv90aQ
+n8AHGvCegLncD+2U8ddgNdd0JjW3FuxCf+PZU+w/XP7uMGGZa6eUudCNNT9NwL+rCTq+T2vt
+ayAonQ2RcHCh7sJdSI5nTxGd8MwFKff79IPfkrB/WcYiVn0ZnSxJTjrDjy7afEqY/yjw7Cmi
+k5K5juex/7V3Dz5yhVEUwP+cce2GjWu7cW3btm03qm27QRXVtt2ZbO8op/r2vp7qS+a+uHHP
+5r7z252ze2N7UUrZZxMB0FBw6GxQUJ1JdXlEXSHcn3oB7g/MFSPN5a75fyEAQGG5QIHUWe9I
+wCskBYa4Qrg/rfADSNZces1Poeb/swAoKEBnM4Lq7H372B32Ct2RAUxb3B/KXHzN/wcBcFCA
+zor92sQVIic01eTzprg/pLn0mn/Hgz/mKVC4moECobMgV4gd8snnTfWM5fTL/G1ZlK75HgTA
+QUGu7eJAOhNG6RMaboDXKWOuhTAXUfM9CICGAnTGD/m4AR7MNQunn6j5HgTAQgEv5CnQGTHk
+IwZ4MNfE+C80iE2o+Z4GgBTSUOgFKKg6G41vl5JDPmKANyKAuVDzO6HmexAAAQVSZxjy1cMV
+ogd4OP0yc1uimgs1Hx9n8zIAHgp4GSwQnUWZCQ0xwBNzzYO5yJrvfwCAwmmBQklGZ8SQDwM8
+t7mm4cVL1HzvA+ChEE5OcOoMc2JqgAdzjcU3O4ma70EAPBQup/a3cUEBOhse168QMcCDuSLB
+aj7xu329CICHAnTWHzrThnz6AA//+30VcxE1388AeChAZz0jxJAPAzynuYia738AxPPqRgYK
+sWJ1Fv7xCgmvlAHMtwM8mGsSzKXW/AIIQIUCdKYP+fQBnkzYVkQcNb8ian5hBQAoNMPX5nc6
+Gwyd6UM+DPB0cyk1vwACUKAAnfWJ6kO+YgZ4vcRcePHqNb9gAlCggJfBTPyaLveQzzHA6wZz
+OWu+BaBAATpThnx3McBzmctR8y0ABQrQmXvIhwGe21zrSqfOjUfNtwB0KEBnUegsN+SLOQd4
+MJde8y0ARwqAQj6DudBZZsiXcA5gekSSs2EureZbAAoUquKFPDWns++HfBjgwVyo+RfmoeZb
+ADQUcjobk9HZN0M+DPBgLtT8I0TNtwDcUFiW0dm3Qz7cn4E5c2Vq/gCm5lsAChSgs+wVwgAP
+5krX/LV8zbcAFCisjiRnxpI9wrkhX3qAlxCsibnYD+1YAAQUJkQ/dozL8ZEBzIf28eTYaHJt
+Ga7mWwAEFPalNtdNDo89bphIfwBdzLWhBlnzLQD+JwoH+7/qVvFlpwqpPT34mm8B8M/n15+P
+Lf90cGHRpxf4RwvAHt8DsMcCsADssQAsAHssAAvAni8AV5380akCdgAAAABJRU5ErkJggg==
+--B_3664825007_384940722--
+
+--B_3664825007_1904734766
+Content-type: application/pkcs7-signature; name="smime.p7s"
+Content-transfer-encoding: base64
+Content-disposition: attachment;
+	filename="smime.p7s"
+
+MIIRpwYJKoZIhvcNAQcCoIIRmDCCEZQCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0B
+BwGggg8VMIIHojCCBYqgAwIBAgIEZ5a6PTANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMC
+REUxDzANBgNVBAgMBkJheWVybjERMA8GA1UEBwwITXVlbmNoZW4xEDAOBgNVBAoMB1NpZW1l
+bnMxETAPBgNVBAUTCFpaWlpaWkE2MR0wGwYDVQQLDBRTaWVtZW5zIFRydXN0IENlbnRlcjE/
+MD0GA1UEAww2U2llbWVucyBJc3N1aW5nIENBIE1lZGl1bSBTdHJlbmd0aCBBdXRoZW50aWNh
+dGlvbiAyMDE2MB4XDTE5MTEyMTE0NDQ0N1oXDTIwMTEyMTE0NDQ0N1owdzERMA8GA1UEBRMI
+WjAwM0gwOFQxDjAMBgNVBCoMBURpZWdvMRgwFgYDVQQEDA9Mb3V6YW4gTWFydGluZXoxGDAW
+BgNVBAoMD1NpZW1lbnMtUGFydG5lcjEeMBwGA1UEAwwVTG91emFuIE1hcnRpbmV6IERpZWdv
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuInpNaC7NRYD+0pOpHDz2pk9xmPt
+JGj860SF6Nmn6Eu9EMYKEDfneC6z5QcH+mPS2d0VWgqVVGbRXSPsxJtbi9TCWjQUZdHglEZK
+z9zxoFDh2dvW5/+TOT5Jf78FXyqak0YtY6+oMjQ/i9RUqPL7sIlyXLrBYrILzQ9Afo+7bXZg
+v3ypp6xtqAV2ctHzQWFi0onJzxLVYguiVb7fFF9rBEMvSZonuw5tvOwJIhbe5FDFOrDcfbyU
+ofZ/wikIZ+A+CE5GryXuuQmGxJaC2QqOkRAWQDzLDx9nG+rKiEs5OvlfEZC7EV1PyjZ93coM
+faCVdlAgcFZ5fvd37CjyjKl+1QIDAQABo4IC9DCCAvAwggEEBggrBgEFBQcBAQSB9zCB9DAy
+BggrBgEFBQcwAoYmaHR0cDovL2FoLnNpZW1lbnMuY29tL3BraT9aWlpaWlpBNi5jcnQwQQYI
+KwYBBQUHMAKGNWxkYXA6Ly9hbC5zaWVtZW5zLm5ldC9DTj1aWlpaWlpBNixMPVBLST9jQUNl
+cnRpZmljYXRlMEkGCCsGAQUFBzAChj1sZGFwOi8vYWwuc2llbWVucy5jb20vQ049WlpaWlpa
+QTYsbz1UcnVzdGNlbnRlcj9jQUNlcnRpZmljYXRlMDAGCCsGAQUFBzABhiRodHRwOi8vb2Nz
+cC5wa2ktc2VydmljZXMuc2llbWVucy5jb20wHwYDVR0jBBgwFoAU+BVdRwxsd3tyxAIXkWii
+tvdqCUQwDAYDVR0TAQH/BAIwADBFBgNVHSAEPjA8MDoGDSsGAQQBoWkHAgIEAQMwKTAnBggr
+BgEFBQcCARYbaHR0cDovL3d3dy5zaWVtZW5zLmNvbS9wa2kvMIHKBgNVHR8EgcIwgb8wgbyg
+gbmggbaGJmh0dHA6Ly9jaC5zaWVtZW5zLmNvbS9wa2k/WlpaWlpaQTYuY3JshkFsZGFwOi8v
+Y2wuc2llbWVucy5uZXQvQ049WlpaWlpaQTYsTD1QS0k/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdIZJbGRhcDovL2NsLnNpZW1lbnMuY29tL0NOPVpaWlpaWkE2LG89VHJ1c3RjZW50ZXI/
+Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwQwDgYDVR0PAQH/BAQDAgeAMFUGA1UdEQROMEygLAYKKwYBBAGCNxQCA6AeDBxkaWVnby5s
+b3V6YW4uZXh0QHNpZW1lbnMuY29tgRxkaWVnby5sb3V6YW4uZXh0QHNpZW1lbnMuY29tMB0G
+A1UdDgQWBBQj8k8aqZey68w8ALYKGJSGMt5hZDANBgkqhkiG9w0BAQsFAAOCAgEAFDHqxpb1
+R9cB4noC9vx09bkNbmXCpVfl3XCQUmAWTznC0nwEssTTjo0PWuIV4C3jnsp0MRUeHZ6lsyhZ
+OzS1ETwYgvj6wzjb8RF3wgn7N/JOvFGaErMz5HZpKOfzGiNpW6/Rmd4hsRDjAwOVQOXUTqc/
+0Bj3FMoLRCSWSnTp5HdyvrY2xOKHfTrTjzmcLdFaKE2F5n7+dBkwCKVfzut8CqfVq/I7ks4m
+D1IHk93/P6l9U34R2FHPt6zRTNZcWmDirRSlMH4L18CnfiNPuDN/PtRYlt3Vng5EdYN0VCg2
+NM/uees0U4ingCb0NFjg66uQ/tjfPQk55MN4Wpls4N6TkMoTCWLiqZzYTGdmVQexzroL6940
+tmMr8LoN3TpPf0OdvdKEpyH7fzsx5QlmQyywIWec6X+Fx6+l0g91VJnPEtqACpfZIBZtviHl
+gfX298w+SsvBK8C48Pqs8Ijh7tLrCxx7VMLVHZqwWWPK53ga+CDWmjoSQPxi+CPZF7kao6N5
+4GrJWwSHlHh6WzTbLyLvTJZZ775Utp4W8s8xMUsQJ413iYzEaC8FcSeNjSk5UiDDiHrKmzpM
+tbApD3pUXStblUMKYGTG1Mj9BcEBFkCdoGlw/ulszIrKFfOyRNDG3Ay+Dj/oMjoKsJphu3px
+wyft82rTer7UW/I7o0h0DAG4lkMwggdrMIIFU6ADAgECAgR5nlqfMA0GCSqGSIb3DQEBCwUA
+MIGeMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQ
+MA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTMxHTAbBgNVBAsMFFNpZW1lbnMg
+VHJ1c3QgQ2VudGVyMScwJQYDVQQDDB5TaWVtZW5zIElzc3VpbmcgQ0EgRUUgRW5jIDIwMTYw
+HhcNMTkwOTI3MDgwMTM5WhcNMjAwOTI3MDgwMTM3WjB3MREwDwYDVQQFEwhaMDAzSDA4VDEO
+MAwGA1UEKgwFRGllZ28xGDAWBgNVBAQMD0xvdXphbiBNYXJ0aW5lejEYMBYGA1UECgwPU2ll
+bWVucy1QYXJ0bmVyMR4wHAYDVQQDDBVMb3V6YW4gTWFydGluZXogRGllZ28wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyby5qKzZIrGYWRqxnaAyMt/a/uc0uMk0F3MjwxvPM
+vh5DllUpqx0l8ZDakDjPhlEXTeoL4DHNgmh+CDCs76CppM3cNG/1W1Ajo/L2iwMoXaxYuQ/F
+q7ED+02KEkWX2DDVVG3fhrUGP20QAq77xPDptmVWZnUnuobZBNYkC49Xfl9HJvkJL8P0+Jqb
+Eae7p4roiEr7wNkGriwrVXgA3oPNF/W+OuI76JTNTajS/6PAK/GeqIvLjfuBXpdBZTY031nE
+Cztca8vI1jUjQzVhS+0dWpvpfhkVumbvOnid8DI9lapYsX8dpZFsa3ya+T3tjUdGSOOKi0kg
+lWf/XYyyfhmDAgMBAAGjggLVMIIC0TAdBgNVHQ4EFgQUprhTCDwNLfPImpSfWdq+QvPTo9Mw
+JwYDVR0RBCAwHoEcZGllZ28ubG91emFuLmV4dEBzaWVtZW5zLmNvbTAOBgNVHQ8BAf8EBAMC
+BDAwLAYDVR0lBCUwIwYIKwYBBQUHAwQGCisGAQQBgjcKAwQGCysGAQQBgjcKAwQBMIHKBgNV
+HR8EgcIwgb8wgbyggbmggbaGJmh0dHA6Ly9jaC5zaWVtZW5zLmNvbS9wa2k/WlpaWlpaQTMu
+Y3JshkFsZGFwOi8vY2wuc2llbWVucy5uZXQvQ049WlpaWlpaQTMsTD1QS0k/Y2VydGlmaWNh
+dGVSZXZvY2F0aW9uTGlzdIZJbGRhcDovL2NsLnNpZW1lbnMuY29tL0NOPVpaWlpaWkEzLG89
+VHJ1c3RjZW50ZXI/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDBFBgNVHSAEPjA8MDoGDSsG
+AQQBoWkHAgIEAQMwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5zaWVtZW5zLmNvbS9wa2kv
+MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUoassbqB68NPCTeof8R4hivwMre8wggEEBggr
+BgEFBQcBAQSB9zCB9DAyBggrBgEFBQcwAoYmaHR0cDovL2FoLnNpZW1lbnMuY29tL3BraT9a
+WlpaWlpBMy5jcnQwQQYIKwYBBQUHMAKGNWxkYXA6Ly9hbC5zaWVtZW5zLm5ldC9DTj1aWlpa
+WlpBMyxMPVBLST9jQUNlcnRpZmljYXRlMEkGCCsGAQUFBzAChj1sZGFwOi8vYWwuc2llbWVu
+cy5jb20vQ049WlpaWlpaQTMsbz1UcnVzdGNlbnRlcj9jQUNlcnRpZmljYXRlMDAGCCsGAQUF
+BzABhiRodHRwOi8vb2NzcC5wa2ktc2VydmljZXMuc2llbWVucy5jb20wDQYJKoZIhvcNAQEL
+BQADggIBAF98ZMNg28LgkwdjOdvOGbC1QitsWjZTyotmQESF0nClDLUhb0O5675vVixntbrf
+eB8xy1+KRiadk40GnAIJ0YzmNl4Tav6hPYv9VBWe5olsWG7C4qB3Q/SwhvW/e+owxv1cBra8
+R3oRudiN81eTZQHyNghRephVqQG/dpPYqydoANfIhEpHa79QlpaCAeYl4896AZOS8HYbkDFs
+hLdv7sEHtl79YuSWI1wBjbJl70c0Sb4wLRgCPuHyQj2Uw/vQ5xJlEvBDZAIXXe1TP/nqiuY6
+7nweJbbeqfFE6ZP3kCe+mEIWGSaO0iThZyLGer8fHs1XiEmhhPgvC7P7KodzpXU6+hX+ZzbD
+DxEjFfetV5sh0aNSXG9xx4hZmS9bpImBGR8MvZ7cgxqItvLtY2xvfUbYW244d4RcWesaCDq3
+ZEIo6uCIzOzJAwjUdLIac+lLV0rxiHmb7O3cQ19kjpWDB31hmfrus/TKJ55pBKVWBX5m/mFv
+K8Ep5USpGrNS0EzOP7I1kQZv2VsvAhSxk/m5FMLpDy8T0O8YgbLypTXoeJFWCF6RduSjVsaZ
+lkAtTQYud683pjyOMxJXaQUYGU1PmEYSOonMkVsT9aBcxYkXLp+Ln/+8G0OCYu7dRdwnj+Ut
+7yR/ltxtgDcaFApCb0qBTKbgbqZk1fASmkOp+kbdYmoUMYICVjCCAlICAQEwgb8wgbYxCzAJ
+BgNVBAYTAkRFMQ8wDQYDVQQIDAZCYXllcm4xETAPBgNVBAcMCE11ZW5jaGVuMRAwDgYDVQQK
+DAdTaWVtZW5zMREwDwYDVQQFEwhaWlpaWlpBNjEdMBsGA1UECwwUU2llbWVucyBUcnVzdCBD
+ZW50ZXIxPzA9BgNVBAMMNlNpZW1lbnMgSXNzdWluZyBDQSBNZWRpdW0gU3RyZW5ndGggQXV0
+aGVudGljYXRpb24gMjAxNgIEZ5a6PTANBglghkgBZQMEAgEFAKBpMC8GCSqGSIb3DQEJBDEi
+BCAOR58AbNfSrI+vtMs+dgAQtn3IVZ3RjYC5hz3j9k+6TTAYBgkqhkiG9w0BCQMxCwYJKoZI
+hvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDAyMTcyMTU2NDdaMA0GCSqGSIb3DQEBAQUABIIB
+AHLSBcFHhNHPevbwqvA2ecuVb/aKnj45CFF6l8esP1H5DRm1ee5qMKuIS84NFuFC9RUENNhW
+DBzsB+BVGz64o1f8QgIklYVrIJ4JZ0q1abNG7NbkVKWIpS3CQo//YWShUTYg+JpKx4YbahGR
+sP5zbufbU4eagrrqBChjPTLy+njdjwCNu0XPykBTKOOf6BMjnS33AYjHJyh83JOY7rw3IDLx
+8POQH4g5EMRpl9354s0rEkIezMt7pfUAsqY3QnQ8hvlE4KTikPQ+tvLMK1l/ffcLAP8BdBNI
+YA3ikb3qCoGNSLKieYzNnBPhNOIJELUtEEaljAFZYMQzMKCbI4JdiDs=
+
+--B_3664825007_1904734766--
diff --git a/spec/frontend/batch_comments/components/review_bar_spec.js b/spec/frontend/batch_comments/components/review_bar_spec.js
index f98e0a4c64..f50db6ab21 100644
--- a/spec/frontend/batch_comments/components/review_bar_spec.js
+++ b/spec/frontend/batch_comments/components/review_bar_spec.js
@@ -6,8 +6,6 @@ import createStore from '../create_batch_comments_store';
 describe('Batch comments review bar component', () => {
   let store;
   let wrapper;
-  let addEventListenerSpy;
-  let removeEventListenerSpy;
 
   const createComponent = (propsData = {}) => {
     store = createStore();
@@ -20,58 +18,25 @@ describe('Batch comments review bar component', () => {
 
   beforeEach(() => {
     document.body.className = '';
-
-    addEventListenerSpy = jest.spyOn(window, 'addEventListener');
-    removeEventListenerSpy = jest.spyOn(window, 'removeEventListener');
   });
 
   afterEach(() => {
-    addEventListenerSpy.mockRestore();
-    removeEventListenerSpy.mockRestore();
     wrapper.destroy();
   });
 
-  describe('when mounted', () => {
-    it('it adds review-bar-visible class to body', async () => {
-      expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(false);
+  it('it adds review-bar-visible class to body when review bar is mounted', async () => {
+    expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(false);
 
-      createComponent();
+    createComponent();
 
-      expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(true);
-    });
-
-    it('it adds a blocking handler to the `beforeunload` window event', () => {
-      expect(addEventListenerSpy).not.toBeCalled();
-
-      createComponent();
-
-      expect(addEventListenerSpy).toHaveBeenCalledTimes(1);
-      expect(addEventListenerSpy).toBeCalledWith('beforeunload', expect.any(Function), {
-        capture: true,
-      });
-    });
+    expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(true);
   });
 
-  describe('before destroyed', () => {
-    it('it removes review-bar-visible class to body', async () => {
-      createComponent();
+  it('it removes review-bar-visible class to body when review bar is destroyed', async () => {
+    createComponent();
 
-      wrapper.destroy();
+    wrapper.destroy();
 
-      expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(false);
-    });
-
-    it('it removes the blocking handler from the `beforeunload` window event', () => {
-      createComponent();
-
-      expect(removeEventListenerSpy).not.toBeCalled();
-
-      wrapper.destroy();
-
-      expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
-      expect(removeEventListenerSpy).toBeCalledWith('beforeunload', expect.any(Function), {
-        capture: true,
-      });
-    });
+    expect(document.body.classList.contains(REVIEW_BAR_VISIBLE_CLASS_NAME)).toBe(false);
   });
 });
diff --git a/spec/frontend/blob/blob_blame_link_spec.js b/spec/frontend/blob/blob_blame_link_spec.js
new file mode 100644
index 0000000000..0d19177a11
--- /dev/null
+++ b/spec/frontend/blob/blob_blame_link_spec.js
@@ -0,0 +1,47 @@
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
+import addBlameLink from '~/blob/blob_blame_link';
+
+describe('Blob links', () => {
+  const mouseoverEvent = new MouseEvent('mouseover', {
+    view: window,
+    bubbles: true,
+    cancelable: true,
+  });
+
+  beforeEach(() => {
+    setHTMLFixture(`
+    <div id="blob-content-holder">
+      <div class="line-numbers" data-blame-path="/blamePath">
+        <a id="L5" href="#L5" data-line-number="5" class="file-line-num js-line-links">5</a>
+      </div>
+      <pre id="LC5">Line 5 content</pre>
+    </div>
+    `);
+
+    addBlameLink('#blob-content-holder', 'js-line-links');
+    document.querySelector('.file-line-num').dispatchEvent(mouseoverEvent);
+  });
+
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
+  it('adds wrapper elements with correct classes', () => {
+    const wrapper = document.querySelector('.line-links');
+
+    expect(wrapper).toBeTruthy();
+    expect(wrapper.classList).toContain('diff-line-num');
+  });
+
+  it('adds blame link with correct classes and path', () => {
+    const blameLink = document.querySelector('.file-line-blame');
+    expect(blameLink).toBeTruthy();
+    expect(blameLink.getAttribute('href')).toBe('/blamePath#L5');
+  });
+
+  it('adds line link within wraper with correct classes and path', () => {
+    const lineLink = document.querySelector('.file-line-num');
+    expect(lineLink).toBeTruthy();
+    expect(lineLink.getAttribute('href')).toBe('#L5');
+  });
+});
diff --git a/spec/frontend/blob/blob_links_tracking_spec.js b/spec/frontend/blob/blob_links_tracking_spec.js
index 22e087bc18..8ef1e9f0ac 100644
--- a/spec/frontend/blob/blob_links_tracking_spec.js
+++ b/spec/frontend/blob/blob_links_tracking_spec.js
@@ -15,7 +15,7 @@ describe('Blob links Tracking', () => {
 
   beforeEach(() => {
     setHTMLFixture(`
-    <div id="blob-content-holder">
+    <div class="file-holder">
       <div class="line-links diff-line-num">
         <a href="#L5" class="file-line-blame"></a>
         <a id="L5" href="#L5" data-line-number="5" class="file-line-num">5</a>
@@ -23,7 +23,7 @@ describe('Blob links Tracking', () => {
       <pre id="LC5">Line 5 content</pre>
     </div>
     `);
-    addBlobLinksTracking('#blob-content-holder', eventsToTrack);
+    addBlobLinksTracking();
     jest.spyOn(Tracking, 'event');
   });
 
diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
index b7dffbbec0..a304775282 100644
--- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js
+++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
@@ -314,6 +314,43 @@ describe('ErrorTrackingList', () => {
     });
   });
 
+  describe('when the resolve button is clicked with non numberic error id', () => {
+    beforeEach(() => {
+      store.state.list.loading = false;
+      store.state.list.errors = [
+        {
+          id: 'abc',
+          title: 'PG::ConnectionBad: FATAL',
+          type: 'error',
+          userCount: 0,
+          count: '53',
+          firstSeen: '2019-05-30T07:21:46Z',
+          lastSeen: '2019-11-06T03:21:39Z',
+          status: 'unresolved',
+        },
+      ];
+
+      mountComponent({
+        stubs: {
+          GlTable: false,
+          GlLink: false,
+        },
+      });
+    });
+
+    it('should show about:blank link', () => {
+      findErrorActions().vm.$emit('update-issue-status', {
+        errorId: 'abc',
+        status: 'resolved',
+      });
+
+      expect(actions.updateStatus).toHaveBeenCalledWith(expect.anything(), {
+        endpoint: 'about:blank',
+        status: 'resolved',
+      });
+    });
+  });
+
   describe('When error tracking is disabled and user is not allowed to enable it', () => {
     beforeEach(() => {
       mountComponent({
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index 073cebeecd..cc6804f035 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -5,6 +5,25 @@ require 'spec_helper'
 RSpec.describe EventsHelper do
   include Gitlab::Routing
 
+  describe '#event_target_path' do
+    subject { helper.event_target_path(event.present) }
+
+    context 'when target is a work item' do
+      let(:work_item) { create(:work_item) }
+      let(:event) { create(:event, target: work_item, target_type: 'WorkItem') }
+
+      it { is_expected.to eq(Gitlab::UrlBuilder.build(work_item, only_path: true)) }
+    end
+
+    context 'when target is not a work item' do
+      let(:project) { create(:project) }
+      let(:issue) { create(:issue, project: project) }
+      let(:event) { create(:event, target: issue, project: project) }
+
+      it { is_expected.to eq([project, issue]) }
+    end
+  end
+
   describe '#event_commit_title' do
     let(:message) { 'foo & bar ' + 'A' * 70 + '\n' + 'B' * 80 }
 
diff --git a/spec/lib/bulk_imports/projects/pipelines/repository_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/repository_pipeline_spec.rb
index 38b22538e7..a968104fc9 100644
--- a/spec/lib/bulk_imports/projects/pipelines/repository_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/projects/pipelines/repository_pipeline_spec.rb
@@ -20,8 +20,9 @@ RSpec.describe BulkImports::Projects::Pipelines::RepositoryPipeline do
     )
   end
 
-  let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
-  let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
+  let_it_be_with_reload(:tracker) { create(:bulk_import_tracker, entity: entity) }
+
+  let(:context) { BulkImports::Pipeline::Context.new(tracker) }
 
   let(:extracted_data) { BulkImports::Pipeline::ExtractedData.new(data: project_data) }
 
@@ -61,7 +62,7 @@ RSpec.describe BulkImports::Projects::Pipelines::RepositoryPipeline do
     context 'blocked local networks' do
       let(:project_data) { { 'httpUrlToRepo' => 'http://localhost/foo.git' } }
 
-      it 'imports new repository into destination project' do
+      it 'prevents import' do
         allow(Gitlab.config.gitlab).to receive(:host).and_return('notlocalhost.gitlab.com')
         allow(Gitlab::CurrentSettings).to receive(:allow_local_requests_from_web_hooks_and_services?).and_return(false)
 
@@ -70,6 +71,18 @@ RSpec.describe BulkImports::Projects::Pipelines::RepositoryPipeline do
         expect(context.entity.failed?).to eq(true)
       end
     end
+
+    context 'when scheme is blocked' do
+      let(:project_data) { { 'httpUrlToRepo' => 'file://example/tmp/foo.git' } }
+
+      it 'prevents import' do
+        pipeline.run
+
+        expect(context.entity.failed?).to eq(true)
+        expect(context.entity.failures.first).to be_present
+        expect(context.entity.failures.first.exception_message).to eq('Only allowed schemes are http, https')
+      end
+    end
   end
 
   describe '#after_run' do
diff --git a/spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb
index 4d12b49e2c..dfd01cdf4b 100644
--- a/spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb
@@ -135,9 +135,25 @@ RSpec.describe BulkImports::Projects::Pipelines::SnippetsRepositoryPipeline do
       end
 
       context 'when url is invalid' do
-        let(:http_url_to_repo) { 'http://0.0.0.0' }
+        context 'when not a real URL' do
+          let(:http_url_to_repo) { 'http://0.0.0.0' }
 
-        it_behaves_like 'skippable snippet'
+          it_behaves_like 'skippable snippet'
+        end
+
+        context 'when scheme is blocked' do
+          let(:http_url_to_repo) { 'file://example.com/foo/bar/snippets/42.git' }
+
+          it_behaves_like 'skippable snippet'
+
+          it 'logs the failure' do
+            pipeline.run
+
+            expect(tracker.failed?).to eq(true)
+            expect(tracker.entity.failures.first).to be_present
+            expect(tracker.entity.failures.first.exception_message).to eq('Only allowed schemes are http, https')
+          end
+        end
       end
 
       context 'when snippet is invalid' do
diff --git a/spec/lib/error_tracking/sentry_client/event_spec.rb b/spec/lib/error_tracking/sentry_client/event_spec.rb
index 64e674f1e9..9107920219 100644
--- a/spec/lib/error_tracking/sentry_client/event_spec.rb
+++ b/spec/lib/error_tracking/sentry_client/event_spec.rb
@@ -71,5 +71,13 @@ RSpec.describe ErrorTracking::SentryClient do
         end
       end
     end
+
+    it_behaves_like 'non-numeric input handling in Sentry response', 'issue_id' do
+      let(:sentry_api_response) do
+        sample_response.tap do |event|
+          event[:groupID] = id_input
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/error_tracking/sentry_client/issue_spec.rb b/spec/lib/error_tracking/sentry_client/issue_spec.rb
index d7bb0ca5c9..e2135dc12c 100644
--- a/spec/lib/error_tracking/sentry_client/issue_spec.rb
+++ b/spec/lib/error_tracking/sentry_client/issue_spec.rb
@@ -209,6 +209,15 @@ RSpec.describe ErrorTracking::SentryClient::Issue do
       it_behaves_like 'issues have correct return type', Gitlab::ErrorTracking::Error
       it_behaves_like 'issues have correct length', 3
     end
+
+    it_behaves_like 'non-numeric input handling in Sentry response', 'id' do
+      let(:sentry_api_response) do
+        issues_sample_response.first(1).map do |issue|
+          issue[:id] = id_input
+          issue
+        end
+      end
+    end
   end
 
   describe '#issue_details' do
@@ -218,8 +227,9 @@ RSpec.describe ErrorTracking::SentryClient::Issue do
       )
     end
 
+    let(:sentry_api_response) { issue_sample_response }
     let(:sentry_request_url) { "#{sentry_url}/issues/#{issue_id}/" }
-    let!(:sentry_api_request) { stub_sentry_request(sentry_request_url, body: issue_sample_response) }
+    let!(:sentry_api_request) { stub_sentry_request(sentry_request_url, body: sentry_api_response) }
 
     subject { client.issue_details(issue_id: issue_id) }
 
@@ -304,6 +314,14 @@ RSpec.describe ErrorTracking::SentryClient::Issue do
         expect(subject.tags).to eq({ level: issue_sample_response['level'], logger: issue_sample_response['logger'] })
       end
     end
+
+    it_behaves_like 'non-numeric input handling in Sentry response', 'id' do
+      let(:sentry_api_response) do
+        issue_sample_response.tap do |issue|
+          issue[:id] = id_input
+        end
+      end
+    end
   end
 
   describe '#update_issue' do
diff --git a/spec/lib/gitlab/checks/tag_check_spec.rb b/spec/lib/gitlab/checks/tag_check_spec.rb
index 6cd3a2d1c0..50ffa5fad1 100644
--- a/spec/lib/gitlab/checks/tag_check_spec.rb
+++ b/spec/lib/gitlab/checks/tag_check_spec.rb
@@ -81,6 +81,14 @@ RSpec.describe Gitlab::Checks::TagCheck do
           it 'allows tag creation' do
             expect { subject.validate! }.not_to raise_error
           end
+
+          context 'when tag name is the same as default branch' do
+            let(:ref) { "refs/tags/#{project.default_branch}" }
+
+            it 'is prevented' do
+              expect { subject.validate! }.to raise_error(Gitlab::GitAccess::ForbiddenError, /cannot use default branch name to create a tag/)
+            end
+          end
         end
       end
     end
diff --git a/spec/lib/gitlab/ci/ansi2json/line_spec.rb b/spec/lib/gitlab/ci/ansi2json/line_spec.rb
index d16750d19f..b8563bb1d1 100644
--- a/spec/lib/gitlab/ci/ansi2json/line_spec.rb
+++ b/spec/lib/gitlab/ci/ansi2json/line_spec.rb
@@ -87,6 +87,8 @@ RSpec.describe Gitlab::Ci::Ansi2json::Line do
       1.minute + 15.seconds                       | '01:15'
       13.hours + 14.minutes + 15.seconds          | '13:14:15'
       1.day + 13.hours + 14.minutes + 15.seconds  | '37:14:15'
+      Float::MAX                                  | '8765:00:00'
+      10**10000                                   | '8765:00:00'
     end
 
     with_them do
diff --git a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
index 763e6f1b5f..5ce7afa620 100644
--- a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
@@ -23,8 +23,9 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
     end
 
     def referenced_files(text, project)
-      referenced_files = text.scan(FileUploader::MARKDOWN_PATTERN).map do
-        UploaderFinder.new(project, $~[:secret], $~[:file]).execute
+      scanner = FileUploader::MARKDOWN_PATTERN.scan(text)
+      referenced_files = scanner.map do |match|
+        UploaderFinder.new(project, match[0], match[1]).execute
       end
 
       referenced_files.compact.select(&:exists?)
@@ -32,7 +33,9 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
 
     shared_examples "files are accessible" do
       describe '#rewrite' do
-        let!(:new_text) { rewriter.rewrite(new_project) }
+        subject(:rewrite) { new_text }
+
+        let(:new_text) { rewriter.rewrite(new_project) }
 
         let(:old_files) { [image_uploader, zip_uploader] }
         let(:new_files) do
@@ -43,11 +46,15 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
         let(:new_paths) { new_files.map(&:path) }
 
         it 'rewrites content' do
+          rewrite
+
           expect(new_text).not_to eq text
           expect(new_text.length).to eq text.length
         end
 
         it 'copies files' do
+          rewrite
+
           expect(new_files).to all(exist)
           expect(old_paths).not_to match_array new_paths
           expect(old_paths).to all(include(old_project.disk_path))
@@ -55,10 +62,14 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
         end
 
         it 'does not remove old files' do
+          rewrite
+
           expect(old_files).to all(exist)
         end
 
         it 'generates a new secret for each file' do
+          rewrite
+
           expect(new_paths).not_to include image_uploader.secret
           expect(new_paths).not_to include zip_uploader.secret
         end
@@ -68,6 +79,8 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
             allow(finder).to receive(:execute).and_return(nil)
           end
 
+          rewrite
+
           expect(new_files).to be_empty
         end
       end
@@ -84,6 +97,16 @@ RSpec.describe Gitlab::Gfm::UploadsRewriter do
       expect(moved_text.scan(/\A\[.*?\]/).count).to eq(1)
     end
 
+    it 'does not casue a timeout on pathological text' do
+      text = '[!l' * 30000
+
+      Timeout.timeout(3) do
+        moved_text = described_class.new(text, nil, old_project, user).rewrite(new_project)
+
+        expect(moved_text).to eq(text)
+      end
+    end
+
     context "file are stored locally" do
       include_examples "files are accessible"
     end
diff --git a/spec/lib/gitlab/hook_data/group_member_builder_spec.rb b/spec/lib/gitlab/hook_data/group_member_builder_spec.rb
index 35ce31ab89..1551bdbaa9 100644
--- a/spec/lib/gitlab/hook_data/group_member_builder_spec.rb
+++ b/spec/lib/gitlab/hook_data/group_member_builder_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Gitlab::HookData::GroupMemberBuilder do
           expect(data[:group_id]).to eq(group.id)
           expect(data[:user_username]).to eq(group_member.user.username)
           expect(data[:user_name]).to eq(group_member.user.name)
-          expect(data[:user_email]).to eq(group_member.user.email)
+          expect(data[:user_email]).to eq(group_member.user.webhook_email)
           expect(data[:user_id]).to eq(group_member.user.id)
           expect(data[:group_access]).to eq('Developer')
           expect(data[:created_at]).to eq(group_member.created_at&.xmlschema)
diff --git a/spec/models/concerns/integrations/has_web_hook_spec.rb b/spec/models/concerns/integrations/has_web_hook_spec.rb
new file mode 100644
index 0000000000..9061cb90f9
--- /dev/null
+++ b/spec/models/concerns/integrations/has_web_hook_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Integrations::HasWebHook do
+  let(:integration_class) do
+    Class.new(Integration) do
+      include Integrations::HasWebHook
+    end
+  end
+
+  let(:integration) { integration_class.new }
+
+  context 'when hook_url and url_variables are not implemented' do
+    it { expect { integration.hook_url }.to raise_error(NotImplementedError) }
+    it { expect { integration.url_variables }.to raise_error(NotImplementedError) }
+  end
+
+  context 'when integration does not respond to enable_ssl_verification' do
+    it { expect(integration.hook_ssl_verification).to eq true }
+  end
+
+  context 'when integration responds to enable_ssl_verification' do
+    let(:integration) { build(:drone_ci_integration) }
+
+    it { expect(integration.hook_ssl_verification).to eq true }
+  end
+end
diff --git a/spec/models/hooks/web_hook_log_spec.rb b/spec/models/hooks/web_hook_log_spec.rb
index 8ff8a1c386..3441dfda7d 100644
--- a/spec/models/hooks/web_hook_log_spec.rb
+++ b/spec/models/hooks/web_hook_log_spec.rb
@@ -44,26 +44,49 @@ RSpec.describe WebHookLog do
       end
     end
 
-    context 'with author email' do
+    context "with users' emails" do
       let(:author) { create(:user) }
+      let(:user) { create(:user) }
       let(:web_hook_log) { create(:web_hook_log, request_data: data) }
       let(:data) do
         {
-          commit: {
-            author: {
-              name: author.name,
-              email: author.email
+          user: {
+            name: user.name,
+            email: user.email
+          },
+          commits: [
+            {
+              user: {
+                name: author.name,
+                email: author.email
+              }
+            },
+            {
+              user: {
+                name: user.name,
+                email: user.email
+              }
             }
-          }
+          ]
         }.deep_stringify_keys
       end
 
-      it "redacts author's email" do
-        expect(web_hook_log.request_data['commit']).to match a_hash_including(
-          'author' => {
-            'name' => author.name,
-            'email' => _('[REDACTED]')
-          }
+      it "redacts users' emails" do
+        expect(web_hook_log.request_data['user']).to match a_hash_including(
+          'name' => user.name,
+          'email' => _('[REDACTED]')
+        )
+        expect(web_hook_log.request_data['commits'].pluck('user')).to match_array(
+          [
+            {
+              'name' => author.name,
+              'email' => _('[REDACTED]')
+            },
+            {
+              'name' => user.name,
+              'email' => _('[REDACTED]')
+            }
+          ]
         )
       end
     end
diff --git a/spec/models/integrations/buildkite_spec.rb b/spec/models/integrations/buildkite_spec.rb
index 38ceb5db49..c720dc6d41 100644
--- a/spec/models/integrations/buildkite_spec.rb
+++ b/spec/models/integrations/buildkite_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
   end
 
   it_behaves_like Integrations::HasWebHook do
-    let(:hook_url) { 'https://webhook.buildkite.com/deliver/secret-sauce-webhook-token' }
+    let(:hook_url) { 'https://webhook.buildkite.com/deliver/{webhook_token}' }
   end
 
   describe 'Validations' do
@@ -68,7 +68,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
     describe '#hook_url' do
       it 'returns the webhook url' do
         expect(integration.hook_url).to eq(
-          'https://webhook.buildkite.com/deliver/secret-sauce-webhook-token'
+          'https://webhook.buildkite.com/deliver/{webhook_token}'
         )
       end
     end
diff --git a/spec/models/integrations/datadog_spec.rb b/spec/models/integrations/datadog_spec.rb
index cfc44b22a8..1293dd14c5 100644
--- a/spec/models/integrations/datadog_spec.rb
+++ b/spec/models/integrations/datadog_spec.rb
@@ -19,6 +19,7 @@ RSpec.describe Integrations::Datadog do
   let(:dd_tags) { '' }
 
   let(:expected_hook_url) { default_url + "?dd-api-key=#{api_key}&env=#{dd_env}&service=#{dd_service}" }
+  let(:hook_url) { default_url + "?dd-api-key={api_key}&env=#{dd_env}&service=#{dd_service}" }
 
   let(:instance) do
     described_class.new(
@@ -48,7 +49,7 @@ RSpec.describe Integrations::Datadog do
 
   it_behaves_like Integrations::HasWebHook do
     let(:integration) { instance }
-    let(:hook_url) { "#{described_class::URL_TEMPLATE % { datadog_domain: dd_site }}?dd-api-key=#{api_key}&env=#{dd_env}&service=#{dd_service}" }
+    let(:hook_url) { "#{described_class::URL_TEMPLATE % { datadog_domain: dd_site }}?dd-api-key={api_key}&env=#{dd_env}&service=#{dd_service}" }
   end
 
   describe 'validations' do
@@ -132,18 +133,18 @@ RSpec.describe Integrations::Datadog do
     subject { instance.hook_url }
 
     context 'with standard site URL' do
-      it { is_expected.to eq(expected_hook_url) }
+      it { is_expected.to eq(hook_url) }
     end
 
     context 'with custom URL' do
       let(:api_url) { 'https://webhook-intake.datad0g.com/api/v2/webhook' }
 
-      it { is_expected.to eq(api_url + "?dd-api-key=#{api_key}&env=#{dd_env}&service=#{dd_service}") }
+      it { is_expected.to eq(api_url + "?dd-api-key={api_key}&env=#{dd_env}&service=#{dd_service}") }
 
       context 'blank' do
         let(:api_url) { '' }
 
-        it { is_expected.to eq(expected_hook_url) }
+        it { is_expected.to eq(hook_url) }
       end
     end
 
@@ -152,19 +153,19 @@ RSpec.describe Integrations::Datadog do
       let(:dd_env) { '' }
       let(:dd_tags) { '' }
 
-      it { is_expected.to eq(default_url + "?dd-api-key=#{api_key}") }
+      it { is_expected.to eq(default_url + "?dd-api-key={api_key}") }
     end
 
     context 'with custom tags' do
       let(:dd_tags) { "key:value\nkey2:value, 2" }
       let(:escaped_tags) { CGI.escape("key:value,\"key2:value, 2\"") }
 
-      it { is_expected.to eq(expected_hook_url + "&tags=#{escaped_tags}") }
+      it { is_expected.to eq(hook_url + "&tags=#{escaped_tags}") }
 
       context 'and empty lines' do
         let(:dd_tags) { "key:value\r\n\n\n\nkey2:value, 2\n" }
 
-        it { is_expected.to eq(expected_hook_url + "&tags=#{escaped_tags}") }
+        it { is_expected.to eq(hook_url + "&tags=#{escaped_tags}") }
       end
     end
   end
diff --git a/spec/models/integrations/drone_ci_spec.rb b/spec/models/integrations/drone_ci_spec.rb
index 8a51f8a070..6c8a343815 100644
--- a/spec/models/integrations/drone_ci_spec.rb
+++ b/spec/models/integrations/drone_ci_spec.rb
@@ -116,7 +116,7 @@ RSpec.describe Integrations::DroneCi, :use_clean_rails_memory_store_caching do
     include_context :drone_ci_integration
 
     let(:integration) { drone }
-    let(:hook_url) { "#{drone_url}/hook?owner=#{project.namespace.full_path}&name=#{project.path}&access_token=#{token}" }
+    let(:hook_url) { "#{drone_url}/hook?owner=#{project.namespace.full_path}&name=#{project.path}&access_token={token}" }
 
     it 'does not create a hook if project is not present' do
       integration.project = nil
diff --git a/spec/models/integrations/packagist_spec.rb b/spec/models/integrations/packagist_spec.rb
index d1976e73e2..e078debd12 100644
--- a/spec/models/integrations/packagist_spec.rb
+++ b/spec/models/integrations/packagist_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Integrations::Packagist do
 
   it_behaves_like Integrations::HasWebHook do
     let(:integration) { described_class.new(packagist_params) }
-    let(:hook_url) { "#{packagist_server}/api/update-package?username=#{packagist_username}&apiToken=#{packagist_token}" }
+    let(:hook_url) { "#{packagist_server}/api/update-package?username={username}&apiToken={token}" }
   end
 
   it_behaves_like Integrations::ResetSecretFields do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 69cd51137b..7aeace9913 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -6812,6 +6812,25 @@ RSpec.describe User do
     end
   end
 
+  describe '#webhook_email' do
+    let(:user) { build(:user, public_email: nil) }
+
+    context 'when public email is present' do
+      before do
+        user.public_email = "hello@hello.com"
+      end
+      it 'returns public email' do
+        expect(user.webhook_email).to eq(user.public_email)
+      end
+    end
+
+    context 'when public email is nil' do
+      it 'returns [REDACTED]' do
+        expect(user.webhook_email).to eq(_('[REDACTED]'))
+      end
+    end
+  end
+
   describe 'user credit card validation' do
     context 'when user is initialized' do
       let(:user) { build(:user) }
diff --git a/spec/policies/issuable_policy_spec.rb b/spec/policies/issuable_policy_spec.rb
index 706570babd..87362716aa 100644
--- a/spec/policies/issuable_policy_spec.rb
+++ b/spec/policies/issuable_policy_spec.rb
@@ -31,6 +31,10 @@ RSpec.describe IssuablePolicy, models: true do
         expect(policies).to be_allowed(:resolve_note)
       end
 
+      it 'allows reading confidential notes' do
+        expect(policies).to be_allowed(:read_confidential_notes)
+      end
+
       context 'when user is able to read project' do
         it 'enables user to read and update issuables' do
           expect(policies).to be_allowed(:read_issue, :update_issue, :reopen_issue, :read_merge_request, :update_merge_request, :reopen_merge_request)
@@ -86,6 +90,15 @@ RSpec.describe IssuablePolicy, models: true do
       end
     end
 
+    context 'when user is assignee of issuable' do
+      let(:issue) { create(:issue, project: project, assignees: [user]) }
+      let(:policies) { described_class.new(user, issue) }
+
+      it 'allows reading confidential notes' do
+        expect(policies).to be_allowed(:read_confidential_notes)
+      end
+    end
+
     context 'when discussion is locked for the issuable' do
       let(:issue) { create(:issue, project: project, discussion_locked: true) }
 
@@ -138,6 +151,10 @@ RSpec.describe IssuablePolicy, models: true do
       it 'does not allow timelogs creation' do
         expect(permissions(guest, issue)).to be_disallowed(:create_timelog)
       end
+
+      it 'does not allow reading confidential notes' do
+        expect(permissions(guest, issue)).to be_disallowed(:read_confidential_notes)
+      end
     end
 
     context 'when user is a guest member of the project and the author of the issuable' do
@@ -152,6 +169,10 @@ RSpec.describe IssuablePolicy, models: true do
       it 'allows timelogs creation' do
         expect(permissions(reporter, issue)).to be_allowed(:create_timelog)
       end
+
+      it 'allows reading confidential notes' do
+        expect(permissions(reporter, issue)).to be_allowed(:read_confidential_notes)
+      end
     end
   end
 end
diff --git a/spec/policies/todo_policy_spec.rb b/spec/policies/todo_policy_spec.rb
index 16435b2166..34ba7bf927 100644
--- a/spec/policies/todo_policy_spec.rb
+++ b/spec/policies/todo_policy_spec.rb
@@ -3,53 +3,100 @@
 require 'spec_helper'
 
 RSpec.describe TodoPolicy do
-  let_it_be(:author) { create(:user) }
-
-  let_it_be(:user1) { create(:user) }
-  let_it_be(:user2) { create(:user) }
-  let_it_be(:user3) { create(:user) }
+  using RSpec::Parameterized::TableSyntax
 
   let_it_be(:project) { create(:project) }
   let_it_be(:issue) { create(:issue, project: project) }
-
-  let_it_be(:todo1) { create(:todo, author: author, user: user1, issue: issue) }
-  let_it_be(:todo2) { create(:todo, author: author, user: user2, issue: issue) }
-  let_it_be(:todo3) { create(:todo, author: author, user: user2) }
-  let_it_be(:todo4) { create(:todo, author: author, user: user3, issue: issue) }
+  let_it_be(:author) { create(:user) }
 
   def permissions(user, todo)
     described_class.new(user, todo)
   end
 
-  before_all do
-    project.add_developer(user1)
-    project.add_developer(user2)
+  shared_examples 'grants the expected permissions' do |policy|
+    it do
+      if allowed
+        expect(permissions(user, todo)).to be_allowed(policy)
+      else
+        expect(permissions(user, todo)).to be_disallowed(policy)
+      end
+    end
   end
 
   describe 'own_todo' do
-    it 'allows owners to access their own todos if they can read todo target' do
-      [
-        [user1, todo1],
-        [user2, todo2]
-      ].each do |user, todo|
-        expect(permissions(user, todo)).to be_allowed(:read_todo)
-      end
+    let_it_be(:user1) { create(:user) }
+    let_it_be(:user2) { create(:user) }
+    let_it_be(:user3) { create(:user) }
+
+    let_it_be(:todo1) { create(:todo, author: author, user: user1, issue: issue) }
+    let_it_be(:todo2) { create(:todo, author: author, user: user2, issue: issue) }
+    let_it_be(:todo3) { create(:todo, author: author, user: user2) }
+    let_it_be(:todo4) { create(:todo, author: author, user: user3, issue: issue) }
+
+    where(:user, :todo, :allowed) do
+      ref(:user1) | ref(:todo1) | true
+      ref(:user2) | ref(:todo2) | true
+      ref(:user1) | ref(:todo2) | false
+      ref(:user1) | ref(:todo3) | false
+      ref(:user2) | ref(:todo1) | false
+      ref(:user2) | ref(:todo4) | false
+      ref(:user3) | ref(:todo1) | false
+      ref(:user3) | ref(:todo2) | false
+      ref(:user3) | ref(:todo3) | false
+      ref(:user3) | ref(:todo4) | false
+      ref(:user2) | ref(:todo3) | false
     end
 
-    it 'does not allow users to access todos of other users' do
-      [
-        [user1, todo2],
-        [user1, todo3],
-        [user2, todo1],
-        [user2, todo4],
-        [user3, todo1],
-        [user3, todo2],
-        [user3, todo3],
-        [user2, todo3],
-        [user3, todo4]
-      ].each do |user, todo|
-        expect(permissions(user, todo)).to be_disallowed(:read_todo)
-      end
+    before_all do
+      project.add_developer(user1)
+      project.add_developer(user2)
+    end
+
+    with_them do
+      it_behaves_like 'grants the expected permissions', :read_todo
+    end
+  end
+
+  describe 'read_note' do
+    let_it_be(:non_member) { create(:user) }
+    let_it_be(:guest) { create(:user) }
+    let_it_be(:reporter) { create(:user) }
+
+    let_it_be(:note) { create(:note, noteable: issue, project: project) }
+    let_it_be(:internal) { create(:note, :confidential, noteable: issue, project: project) }
+
+    let_it_be(:no_note_todo1) { create(:todo, author: author, user: reporter, issue: issue) }
+    let_it_be(:note_todo1) { create(:todo, note: note, author: author, user: reporter, issue: issue) }
+    let_it_be(:internal_note_todo1) { create(:todo, note: internal, author: author, user: reporter, issue: issue) }
+
+    let_it_be(:no_note_todo2) { create(:todo, author: author, user: guest, issue: issue) }
+    let_it_be(:note_todo2) { create(:todo, note: note, author: author, user: guest, issue: issue) }
+    let_it_be(:internal_note_todo2) { create(:todo, note: internal, author: author, user: guest, issue: issue) }
+
+    let_it_be(:no_note_todo3) { create(:todo, author: author, user: non_member, issue: issue) }
+    let_it_be(:note_todo3) { create(:todo, note: note, author: author, user: non_member, issue: issue) }
+    let_it_be(:internal_note_todo3) { create(:todo, note: internal, author: author, user: non_member, issue: issue) }
+
+    where(:user, :todo, :allowed) do
+      ref(:reporter)   | ref(:no_note_todo1)       | true
+      ref(:reporter)   | ref(:note_todo1)          | true
+      ref(:reporter)   | ref(:internal_note_todo1) | true
+      ref(:guest)      | ref(:no_note_todo2)       | true
+      ref(:guest)      | ref(:note_todo2)          | true
+      ref(:guest)      | ref(:internal_note_todo2) | false
+      ref(:non_member) | ref(:no_note_todo3)       | false
+      ref(:non_member) | ref(:note_todo3)          | false
+      ref(:non_member) | ref(:internal_note_todo3) | false
+    end
+
+    before_all do
+      project.add_guest(guest)
+      project.add_reporter(reporter)
+    end
+
+    with_them do
+      it_behaves_like 'grants the expected permissions', :read_todo
+      it_behaves_like 'grants the expected permissions', :update_todo
     end
   end
 end
diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb
index 0944bfb6ba..d75ca0d4f6 100644
--- a/spec/requests/api/todos_spec.rb
+++ b/spec/requests/api/todos_spec.rb
@@ -224,7 +224,7 @@ RSpec.describe API::Todos do
                project: project_1,
                target: create(:design, issue: issue),
                author: create(:user),
-               note: create(:note, project: project_1, note: "I am note, hear me roar"))
+               note: create(:note, :confidential, project: project_1, note: "I am note, hear me roar"))
       end
 
       def api_request
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 80c455e72b..a606892ddf 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -47,6 +47,19 @@ RSpec.describe Issues::CreateService do
           due_date: Date.tomorrow }
       end
 
+      context 'when an unauthorized project_id is provided' do
+        let(:unauthorized_project) { create(:project) }
+
+        before do
+          opts[:project_id] = unauthorized_project.id
+        end
+
+        it 'ignores the project_id param and creates issue in the given project' do
+          expect(issue.project).to eq(project)
+          expect(unauthorized_project.reload.issues.count).to eq(0)
+        end
+      end
+
       it 'works if base work item types were not created yet' do
         WorkItems::Type.delete_all
 
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index aef3608831..3317917736 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -64,6 +64,23 @@ RSpec.describe Issues::UpdateService, :mailer do
         }
       end
 
+      context 'when an unauthorized project_id is provided' do
+        let(:unauthorized_project) { create(:project) }
+
+        before do
+          opts[:project_id] = unauthorized_project.id
+        end
+
+        it 'ignores the project_id param and does not update the issue\'s project' do
+          expect do
+            update_issue(opts)
+            unauthorized_project.reload
+          end.to not_change { unauthorized_project.issues.count }
+
+          expect(issue.project).to eq(project)
+        end
+      end
+
       it 'updates the issue with the given params' do
         expect(TodosDestroyer::ConfidentialIssueWorker).not_to receive(:perform_in)
 
diff --git a/spec/services/notes/copy_service_spec.rb b/spec/services/notes/copy_service_spec.rb
index f146a49e92..2fa9a462bb 100644
--- a/spec/services/notes/copy_service_spec.rb
+++ b/spec/services/notes/copy_service_spec.rb
@@ -146,8 +146,10 @@ RSpec.describe Notes::CopyService do
           new_note = to_noteable.notes.first
 
           aggregate_failures do
-            expect(note.note).to match(/Simple text with image: #{FileUploader::MARKDOWN_PATTERN}/o)
-            expect(new_note.note).to match(/Simple text with image: #{FileUploader::MARKDOWN_PATTERN}/o)
+            expect(note.note).to match(/Simple text with image:/o)
+            expect(FileUploader::MARKDOWN_PATTERN.match(note.note)).not_to be_nil
+            expect(new_note.note).to match(/Simple text with image:/o)
+            expect(FileUploader::MARKDOWN_PATTERN.match(new_note.note)).not_to be_nil
             expect(note.note).not_to eq(new_note.note)
             expect(note.note_html).not_to eq(new_note.note_html)
           end
diff --git a/spec/services/todos/allowed_target_filter_service_spec.rb b/spec/services/todos/allowed_target_filter_service_spec.rb
index 707df8e851..1d2b1b044d 100644
--- a/spec/services/todos/allowed_target_filter_service_spec.rb
+++ b/spec/services/todos/allowed_target_filter_service_spec.rb
@@ -10,14 +10,23 @@ RSpec.describe Todos::AllowedTargetFilterService do
   let_it_be(:unauthorized_group) { create(:group, :private) }
   let_it_be(:unauthorized_project) { create(:project, group: unauthorized_group) }
   let_it_be(:user) { create(:user) }
+
   let_it_be(:authorized_issue) { create(:issue, project: authorized_project) }
   let_it_be(:authorized_issue_todo) { create(:todo, project: authorized_project, target: authorized_issue, user: user) }
+  let_it_be(:authorized_note) { create(:note, noteable: authorized_issue, project: authorized_project) }
+  let_it_be(:authorized_note_todo) { create(:todo, project: authorized_project, target: authorized_issue, note: authorized_note, user: user) }
+  let_it_be(:confidential_issue) { create(:issue, :confidential, project: authorized_project) }
+  let_it_be(:confidential_issue_todo) { create(:todo, project: authorized_project, target: confidential_issue, user: user) }
+  let_it_be(:confidential_note) { create(:note, :confidential, noteable: confidential_issue, project: authorized_project) }
+  let_it_be(:confidential_note_todo) { create(:todo, project: authorized_project, target: authorized_issue, note: confidential_note, user: user) }
   let_it_be(:unauthorized_issue) { create(:issue, project: unauthorized_project) }
   let_it_be(:unauthorized_issue_todo) { create(:todo, project: unauthorized_project, target: unauthorized_issue, user: user) }
   let_it_be(:authorized_design) { create(:design, issue: authorized_issue) }
   let_it_be(:authorized_design_todo) { create(:todo, project: authorized_project, target: authorized_design, user: user) }
   let_it_be(:unauthorized_design) { create(:design, issue: unauthorized_issue) }
   let_it_be(:unauthorized_design_todo) { create(:todo, project: unauthorized_project, target: unauthorized_design, user: user) }
+  let_it_be(:unauthorized_note) { create(:note, noteable: unauthorized_issue, project: unauthorized_project) }
+  let_it_be(:unauthorized_note_todo) { create(:todo, project: unauthorized_project, target: unauthorized_issue, note: unauthorized_note, user: user) }
 
   # Cannot use let_it_be with MRs
   let(:authorized_mr) { create(:merge_request, source_project: authorized_project) }
@@ -25,35 +34,91 @@ RSpec.describe Todos::AllowedTargetFilterService do
   let(:unauthorized_mr) { create(:merge_request, source_project: unauthorized_project) }
   let(:unauthorized_mr_todo) { create(:todo, project: unauthorized_project, user: user, target: unauthorized_mr) }
 
-  before_all do
-    authorized_group.add_developer(user)
-  end
-
   describe '#execute' do
+    let(:all_todos) { authorized_todos + unauthorized_todos }
+
     subject(:execute_service) { described_class.new(all_todos, user).execute }
 
-    let!(:all_todos) { authorized_todos + unauthorized_todos }
+    shared_examples 'allowed Todos filter' do
+      before do
+        enable_design_management
+      end
 
-    let(:authorized_todos) do
-      [
-        authorized_mr_todo,
-        authorized_issue_todo,
-        authorized_design_todo
-      ]
+      it { is_expected.to match_array(authorized_todos) }
     end
 
-    let(:unauthorized_todos) do
-      [
-        unauthorized_mr_todo,
-        unauthorized_issue_todo,
-        unauthorized_design_todo
-      ]
+    context 'with reporter user' do
+      before_all do
+        authorized_group.add_reporter(user)
+      end
+
+      it_behaves_like 'allowed Todos filter' do
+        let(:authorized_todos) do
+          [
+            authorized_mr_todo,
+            authorized_issue_todo,
+            confidential_issue_todo,
+            confidential_note_todo,
+            authorized_design_todo
+          ]
+        end
+
+        let(:unauthorized_todos) do
+          [
+            unauthorized_mr_todo,
+            unauthorized_issue_todo,
+            unauthorized_note_todo,
+            unauthorized_design_todo
+          ]
+        end
+      end
     end
 
-    before do
-      enable_design_management
+    context 'with guest user' do
+      before_all do
+        authorized_group.add_guest(user)
+      end
+
+      it_behaves_like 'allowed Todos filter' do
+        let(:authorized_todos) do
+          [
+            authorized_issue_todo,
+            authorized_design_todo
+          ]
+        end
+
+        let(:unauthorized_todos) do
+          [
+            authorized_mr_todo,
+            confidential_issue_todo,
+            confidential_note_todo,
+            unauthorized_mr_todo,
+            unauthorized_issue_todo,
+            unauthorized_note_todo,
+            unauthorized_design_todo
+          ]
+        end
+      end
     end
 
-    it { is_expected.to match_array(authorized_todos) }
+    context 'with a non-member user' do
+      it_behaves_like 'allowed Todos filter' do
+        let(:authorized_todos) { [] }
+
+        let(:unauthorized_todos) do
+          [
+            authorized_issue_todo,
+            authorized_design_todo,
+            authorized_mr_todo,
+            confidential_issue_todo,
+            confidential_note_todo,
+            unauthorized_mr_todo,
+            unauthorized_issue_todo,
+            unauthorized_note_todo,
+            unauthorized_design_todo
+          ]
+        end
+      end
+    end
   end
 end
diff --git a/spec/support/shared_examples/bulk_imports/common/pipelines/wiki_pipeline_examples.rb b/spec/support/shared_examples/bulk_imports/common/pipelines/wiki_pipeline_examples.rb
index 06800f7cde..7e7460cd60 100644
--- a/spec/support/shared_examples/bulk_imports/common/pipelines/wiki_pipeline_examples.rb
+++ b/spec/support/shared_examples/bulk_imports/common/pipelines/wiki_pipeline_examples.rb
@@ -4,8 +4,9 @@ RSpec.shared_examples 'wiki pipeline imports a wiki for an entity' do
   describe '#run' do
     let_it_be(:bulk_import_configuration) { create(:bulk_import_configuration, bulk_import: bulk_import) }
 
-    let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
-    let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
+    let_it_be_with_reload(:tracker) { create(:bulk_import_tracker, entity: entity) }
+
+    let(:context) { BulkImports::Pipeline::Context.new(tracker) }
 
     let(:extracted_data) { BulkImports::Pipeline::ExtractedData.new(data: {}) }
 
@@ -40,5 +41,21 @@ RSpec.shared_examples 'wiki pipeline imports a wiki for an entity' do
         expect { subject.run }.not_to raise_error
       end
     end
+
+    context 'when scheme is blocked' do
+      it 'prevents import' do
+        # Force bulk_import_configuration to have a file:// URL
+        bulk_import_configuration.url = 'file://example.com'
+        bulk_import_configuration.save!(validate: false)
+
+        expect(subject).to receive(:source_wiki_exists?).and_return(true)
+
+        subject.run
+
+        expect(tracker.failed?).to eq(true)
+        expect(tracker.entity.failures.first).to be_present
+        expect(tracker.entity.failures.first.exception_message).to eq('Only allowed schemes are http, https')
+      end
+    end
   end
 end
diff --git a/spec/support/shared_examples/lib/sentry/client_shared_examples.rb b/spec/support/shared_examples/lib/sentry/client_shared_examples.rb
index d73c7b6848..2712dce31e 100644
--- a/spec/support/shared_examples/lib/sentry/client_shared_examples.rb
+++ b/spec/support/shared_examples/lib/sentry/client_shared_examples.rb
@@ -58,3 +58,19 @@ RSpec.shared_examples 'maps Sentry exceptions' do |http_method|
     end
   end
 end
+
+RSpec.shared_examples 'non-numeric input handling in Sentry response' do |field|
+  context 'with non-numeric error id' do
+    where(:id_input) do
+      ['string', '-1', '1\n2']
+    end
+
+    with_them do
+      it 'raises exception' do
+        message = %(Sentry API response contains invalid value for field "#{field}": #{id_input.inspect} is not numeric)
+
+        expect { subject }.to raise_error(ErrorTracking::SentryClient::InvalidFieldValueError, message)
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/models/integrations/has_web_hook_shared_examples.rb b/spec/support/shared_examples/models/integrations/has_web_hook_shared_examples.rb
index 2f693edeb5..e309aa50c6 100644
--- a/spec/support/shared_examples/models/integrations/has_web_hook_shared_examples.rb
+++ b/spec/support/shared_examples/models/integrations/has_web_hook_shared_examples.rb
@@ -37,6 +37,12 @@ RSpec.shared_examples Integrations::HasWebHook do
     end
   end
 
+  describe '#url_variables' do
+    it 'returns a string' do
+      expect(integration.url_variables).to be_a(Hash)
+    end
+  end
+
   describe '#hook_ssl_verification' do
     it 'returns a boolean' do
       expect(integration.hook_ssl_verification).to be_in([true, false])
diff --git a/spec/views/events/event/_common.html.haml_spec.rb b/spec/views/events/event/_common.html.haml_spec.rb
new file mode 100644
index 0000000000..0de84e2fdb
--- /dev/null
+++ b/spec/views/events/event/_common.html.haml_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'events/event/_common.html.haml' do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:issue) { create(:issue, project: project) }
+  let_it_be(:user) { create(:user) }
+
+  context 'when it is a work item event' do
+    let(:work_item) { create(:work_item, project: project) }
+
+    let(:event) do
+      create(:event, :created, project: project, target: work_item, target_type: 'WorkItem', author: user)
+    end
+
+    it 'renders the correct url' do
+      render partial: 'events/event/common', locals: { event: event.present }
+
+      expect(rendered).to have_link(
+        work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.id}"
+      )
+    end
+  end
+
+  context 'when it is an isssue event' do
+    let(:issue) { create(:issue, project: project) }
+
+    let(:event) do
+      create(:event, :created, project: project, target: issue, author: user)
+    end
+
+    it 'renders the correct url' do
+      render partial: 'events/event/common', locals: { event: event.present }
+
+      expect(rendered).to have_link(issue.reference_link_text, href: "/#{project.full_path}/-/issues/#{issue.iid}")
+    end
+  end
+end