Merge e575f4b into 0cd6be7

.travis.yml

@@ -26,17 +26,10 @@ before_script:
 script:
   - coverage run --source=$SOURCE_FOLDER -m py.test -W ignore::DeprecationWarning
 deploy:
-  - provider: script
-    script: bash scripts/deploy_docker.sh staging
-    on:
-      branch: master
   - provider: script
     script: bash scripts/deploy_docker.sh develop
     on:
-      branch: develop
-  - provider: script
-    script: bash scripts/deploy_docker.sh $TRAVIS_TAG
-    on:
-      tags: true
+      branch: feature/issue-86
+
 after_success:
   - coveralls

docker/web/run_web.sh

@@ -2,11 +2,14 @@
 
 set -euo pipefail
 
-echo "==> Migrating Django models ... "
+echo "==> Migrating Django models..."
 python manage.py migrate --noinput
+echo "==> Setup Gas Station..."
 python manage.py setup_gas_station
+echo "==> Setup Safe Relay Task..."
 python manage.py setup_safe_relay
 if [ "${DEPLOY_MASTER_COPY_ON_INIT:-0}" = 1 ]; then
+    echo "==> Deploy Safe master copy..."
     python manage.py deploy_safe_master_copy
 fi
 

requirements-test.txt

@@ -1,5 +1,5 @@
 -r requirements.txt
-pytest==4.6.3
-pytest-django==3.5.0
+pytest==5.0.1
+pytest-django==3.5.1
 pytest-sugar==0.9.2
 coverage==4.5.3

requirements.txt

@@ -1,16 +1,16 @@
-Django==2.2.2
+Django==2.2.3
 cachetools==3.1.1
 celery==4.3.0
-django-authtools==1.6.0
+django-authtools==1.7.0
 django-celery-beat==1.5.0
 django-environ==0.4.5
 django-filter==2.1.0
-django-model-utils==3.1.2
+django-model-utils==3.2.0
 django-redis==4.10.0
 djangorestframework-camel-case==1.0.3
 djangorestframework==3.9.4
 docutils==0.14
-drf-yasg[validation]==1.15.0
+drf-yasg[validation]==1.16.0
 eth-abi==1.3.0
 ethereum==2.3.2
 factory-boy==2.12.0
@@ -19,11 +19,10 @@ gevent==1.4.0
 gnosis-py==1.4.0
 gunicorn==19.9.0
 hexbytes==0.2.0
-jsonschema==2.6.0
 lxml==4.2.5
 numpy==1.16.4
 packaging>=19.0
-psycopg2-binary==2.8.2
+psycopg2-binary==2.8.3
 redis==3.2.1
 requests==2.22.0
 web3==4.9.2

safe_relay_service/gas_station/admin.py

@@ -7,4 +7,4 @@
 class GasPriceAdmin(admin.ModelAdmin):
     date_hierarchy = 'created'
     list_display = ('created', 'lowest', 'safe_low', 'standard', 'fast', 'fastest')
-    ordering = ['created']
+    ordering = ['-created']

safe_relay_service/relay/admin.py

@@ -232,8 +232,10 @@ def safe_status(self, obj: SafeFunding):
 
 @admin.register(SafeMultisigTx)
 class SafeMultisigTxAdmin(admin.ModelAdmin):
-    list_display = ('safe_id', 'ethereum_tx_id', 'to', 'value', 'nonce', 'data')
+    date_hierarchy = 'created'
+    list_display = ('created', 'safe_id', 'ethereum_tx_id', 'to', 'value', 'nonce', 'data')
     list_filter = ('operation',)
+    ordering = ['-created']
     search_fields = ['=safe__address', '=ethereum_tx__tx_hash', 'to']