From 60f1845a9b8a090910c9ba02721b182e28a6b7bc Mon Sep 17 00:00:00 2001
From: duker <duker33@gmail.com>
Date: Sat, 7 Jul 2018 17:41:00 +0300
Subject: [PATCH 1/2] se#394  Use custom redirects app

---
 docker/docker-compose.yml       | 2 +-
 requirements.txt                | 2 +-
 stroyprombeton/settings/base.py | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8a9bf9b5..4c7d0a4b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       # contains refarm-site modules
       - $DEPS_DIR
       # Thus, you can work with apps related to the refarm-site
-      # - $REFARM_SRC/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
+      #- $REFARM_DIR/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
     # @todo #150 Validate if `.env` is full
     #  Is full means '.env` contains all keynames from `.env.dist`
     command: python manage.py runserver 0.0.0.0:$VIRTUAL_HOST_PORT
diff --git a/requirements.txt b/requirements.txt
index d83155fe..bd8bfb05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,4 @@ Unidecode==1.0.22
 ua-parser==0.8.0
 user-agents==1.1.0
 https://github.com/selwin/django-user_agents/archive/master.zip
-https://github.com/fidals/refarm-site/archive/0.1.6.zip
+https://github.com/fidals/refarm-site/archive/0.1.7.zip
diff --git a/stroyprombeton/settings/base.py b/stroyprombeton/settings/base.py
index e34a2f37..13ba258f 100644
--- a/stroyprombeton/settings/base.py
+++ b/stroyprombeton/settings/base.py
@@ -51,6 +51,7 @@
     'django.contrib.admin',
     'django_select2',
     'images',
+    'refarm_redirects',
     'pages',
     'search',
     'catalog',
@@ -72,6 +73,7 @@
     'django.middleware.locale.LocaleMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django_user_agents.middleware.UserAgentMiddleware',
+    'refarm_redirects.middleware.RedirectAllMiddleware',
 ]
 
 ROOT_URLCONF = 'stroyprombeton.urls'

From 97dcd2376d9ab204aefb3e068fd222ce9bfcb907 Mon Sep 17 00:00:00 2001
From: duker <duker33@gmail.com>
Date: Mon, 9 Jul 2018 19:57:11 +0300
Subject: [PATCH 2/2] se#394  Skip problem test

---
 docker/docker-compose.yml                    | 2 +-
 stroyprombeton/tests/tests_selenium_admin.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4c7d0a4b..f24b39fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -35,7 +35,7 @@ services:
   nodejs:
     image: fidals/stb-nodejs:dev
     volumes:
-      # for SE's front development
+      # for STB's front development
       - ../gulpfile.babel.js:/usr/app/src/gulpfile.babel.js
       - ../package.json:/usr/app/src/package.json
       - ../front:/usr/app/src/front
diff --git a/stroyprombeton/tests/tests_selenium_admin.py b/stroyprombeton/tests/tests_selenium_admin.py
index 1fed009e..506a4186 100644
--- a/stroyprombeton/tests/tests_selenium_admin.py
+++ b/stroyprombeton/tests/tests_selenium_admin.py
@@ -563,6 +563,7 @@ def get_field_from_jqgrid(self, fieldname, row):
             if td.get_attribute('aria-describedby') == f'jqGrid_{fieldname}'
         )
 
+    # @todo #380:30m Resurrect test `test_mark_search_on_table_editor`
     @unittest.skip('Require filled value for marks.')
     def test_mark_search_on_table_editor(self):
         """