Fakultas Ilmu Komputer UI

Commit 78f520af authored by jordan's avatar jordan
Browse files

hotfix master

parent d97317fa
Pipeline #28523 passed with stages
in 13 minutes and 41 seconds
......@@ -20,4 +20,4 @@ class HeaderAndFooter(FunctionalTest):
# sehingga di footer terdapat nama tersebut.
self.assertIn("Copyright Jordan Muhammad Andrianda", footer_1)
#Pengecekan Tugas Akhir Programming No 1 sudah diselesaikan
# Pengecekan Tugas Akhir Programming No 1 sudah diselesaikan
......@@ -11,6 +11,9 @@ class Navigation(FunctionalTest):
navbar_1 = self.browser.find_element_by_id("navbar_1").text
# Informasi tersebut adalah Dibuat untuk menyelesaikan Tugas Ujian Akhir Penjaminan Mutu Perangkat Lunak 2019, yang ditampilkan di halaman webb
self.assertIn("Dibuat untuk menyelesaikan Tugas Ujian Akhir Penjaminan Mutu Perangkat Lunak 2019", navbar_1)
self.assertIn(
"Dibuat untuk menyelesaikan Tugas Ujian Akhir Penjaminan Mutu Perangkat Lunak 2019",
navbar_1,
)
# engecekan Tugas Akhir Programming No 2 sudah diselesaikan
......@@ -4,7 +4,6 @@ attrs==19.2.0
black==19.3b0
Click==7.0
coverage==5.0
<<<<<<< HEAD
dj-database-url==0.5.0
Django==2.2.5
entrypoints==0.3
......@@ -14,14 +13,6 @@ isort==4.3.21
lazy-object-proxy==1.4.2
mccabe==0.6.1
psycopg2==2.8.4
=======
Django==2.2.5
entrypoints==0.3
flake8==3.7.8
isort==4.3.21
lazy-object-proxy==1.4.2
mccabe==0.6.1
>>>>>>> 119b2431b139e52a82030f75f519a6dcd4e56364
pycodestyle==2.5.0
pyflakes==2.1.1
pylint==2.4.2
......@@ -32,8 +23,5 @@ sqlparse==0.3.0
toml==0.10.0
typed-ast==1.4.0
urllib3==1.25.6
<<<<<<< HEAD
whitenoise==5.0.1
=======
>>>>>>> 119b2431b139e52a82030f75f519a6dcd4e56364
wrapt==1.11.2
......@@ -126,13 +126,14 @@ STATIC_ROOT = os.path.abspath(os.path.join(BASE_DIR, "../static"))
STATICFILES_DIRS = (os.path.join(PROJECT_ROOT, "static"),)
# Add configuration for static files storage using whitenoise
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
import dj_database_url
prod_db = dj_database_url.config(conn_max_age=500)
DATABASES['default'].update(prod_db)
import dj_database_url
ALLOWED_HOSTS = ['jordan-pmpl.herokuapp.com', 'localhost']
prod_db = dj_database_url.config(conn_max_age=500)
DATABASES["default"].update(prod_db)
ALLOWED_HOSTS = ["jordan-pmpl.herokuapp.com", "localhost"]
EMAIL_HOST = "smtp.gmail.com"
......@@ -149,4 +150,4 @@ LOGGING = {
"root": {"level": "INFO"},
}
#testdeploy
# testdeploy
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment