Commit 72b043f2 authored by nano's avatar nano

fixed merge bug

parent 2b69d7d1
Pipeline #73 failed with stage
in 52 seconds
......@@ -15,11 +15,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from fiex.settings import *
import os
DEBUG=True
SECRET_KEY='reallyagreatsecrethere'
from fiex.settings import *
DEBUG = True
SECRET_KEY = 'reallyagreatsecrethere'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
......@@ -28,5 +29,3 @@ DATABASES = {
}
FIEX_DATA_FOLDER = os.getenv('FIEX_DATA_FOLDER')
......@@ -20,7 +20,6 @@ import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
......@@ -34,12 +33,10 @@ FIEX_VALIDATOR_REGEX_PATH = r"^([\w\s\d\.\/\\\-_]+)$"
FIEX_VALIDATOR_REGEX_TEXT = r"^([\w\s\d\.\/\\\-_]+)$"
FIEX_VALIDATOR_REGEX_TOKEN = r"^([\w\s\d]+)$"
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
ALLOWED_HOSTS = ['localhost','127.0.0.1',SERVER_NAME]
ALLOWED_HOSTS = ['localhost', '127.0.0.1', SERVER_NAME]
# Application definition
......@@ -84,7 +81,6 @@ TEMPLATES = [
WSGI_APPLICATION = 'fiex.wsgi.application'
# Database
# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
......@@ -98,7 +94,6 @@ DATABASES = {
}
}
# Password validation
# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
......@@ -117,7 +112,6 @@ AUTH_PASSWORD_VALIDATORS = [
},
]
# Internationalization
# https://docs.djangoproject.com/en/2.1/topics/i18n/
......@@ -131,7 +125,6 @@ USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.1/howto/static-files/
......
# Generated by Django 2.1.3 on 2018-11-25 19:15
# Generated by Django 2.1.3 on 2018-11-27 21:53
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import fiexapp.models
import fiexapp.validators
......@@ -23,7 +24,7 @@ class Migration(migrations.Migration):
('token', models.CharField(default=fiexapp.models.gen_random_token, editable=False, max_length=100, unique=True, verbose_name='access token')),
('password', models.CharField(max_length=100, null=True, verbose_name='optional password')),
('description', models.CharField(max_length=300, validators=[fiexapp.validators.validate_text], verbose_name='description')),
('creation_date', models.DateTimeField(validators=[fiexapp.validators.validate_text], verbose_name='date created')),
('creation_date', models.DateTimeField(verbose_name='date created')),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='created_by', to=settings.AUTH_USER_MODEL)),
],
),
......
# Generated by Django 2.1.3 on 2018-11-25 19:34
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('fiexapp', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='exchange',
name='creation_date',
field=models.DateTimeField(verbose_name='date created'),
),
]
# Generated by Django 2.1.3 on 2018-11-24 14:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('fiexapp', '0006_auto_20181122_2032'),
]
operations = [
migrations.RemoveField(
model_name='file',
name='Exchange',
),
migrations.AlterField(
model_name='exchange',
name='token',
field=models.CharField(default='hf10tne2kt5q', editable=False, max_length=100, unique=True,
verbose_name='access token'),
),
migrations.AlterField(
model_name='permission',
name='description',
field=models.CharField(max_length=300, unique=True, verbose_name='description of the permission'),
),
migrations.AlterField(
model_name='permission',
name='name',
field=models.CharField(max_length=20, unique=True, verbose_name='name of the permission'),
),
migrations.AlterField(
model_name='permissiongranted',
name='date_granted',
field=models.DateField(null=True),
),
migrations.DeleteModel(
name='File',
),
]
Markdown is supported
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