Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#394 Redirects dep. stb2 #397

Merged
merged 3 commits into from
Jul 9, 2018
Merged

#394 Redirects dep. stb2 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593a859
- Fix middleware name
duker33 Jun 22, 2018
9e3b0d0
#396 Fix rf dep version
duker33 Jul 6, 2018
3e2f343
se#394 Rm unused import
duker33 Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
# contains refarm-site modules
- $DEPS_DIR
# Thus, you can work with apps related to the refarm-site
# - $REFARM_SRC/search:/root/.local/lib/python3.6/site-packages/search
#- $REFARM_DIR/search:/root/.local/lib/python3.6/site-packages/search
command: python manage.py runserver 0.0.0.0:$VIRTUAL_HOST_PORT

nodejs:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ ua-parser==0.8.0
user-agents==1.1.0
sorl-thumbnail==12.4a1
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
3 changes: 2 additions & 1 deletion shopelectro/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
'sorl.thumbnail',
'django_select2',
'images',
'refarm_redirects',
'pages',
'catalog',
'search',
Expand All @@ -78,10 +79,10 @@
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django_user_agents.middleware.UserAgentMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
'refarm_redirects.middleware.RedirectAllMiddleware',
]

ROOT_URLCONF = 'shopelectro.urls'
Expand Down
3 changes: 0 additions & 3 deletions shopelectro/tests/tests_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
They all should be using Django's TestClient.
"""
import json
import unittest
from functools import partial
from itertools import chain
from operator import attrgetter
Expand Down Expand Up @@ -573,8 +572,6 @@ class Redirects(TestCase):

fixtures = ['dump.json']

# will be resurrected at rf#140
@unittest.expectedFailure
def test_redirect_from_existing_page(self):
"""`refarm-site.redirects` app should redirect from existing url too."""
# take some existing `url_from`
Expand Down