Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
allgo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
allgo
allgo
Commits
7e28d952
Commit
7e28d952
authored
Jan 29, 2019
by
LETORT Sebastien
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'revert-
ef8ad721
' into 'django'
Revert "Merge branch 'test_update' into 'django'" See merge request
!158
parents
ef8ad721
49105614
Pipeline
#66351
canceled with stage
Changes
5
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
12 deletions
+2
-12
django/Dockerfile
django/Dockerfile
+2
-3
django/config/settings.py
django/config/settings.py
+0
-1
django/docs/generate_models_png.sh
django/docs/generate_models_png.sh
+0
-6
django/docs/models.png
django/docs/models.png
+0
-0
django/requirements_dev.txt
django/requirements_dev.txt
+0
-2
No files found.
django/Dockerfile
View file @
7e28d952
...
...
@@ -10,10 +10,9 @@ RUN apt-getq update && apt-getq install \
python-mysqldb python3-crypto gunicorn3 python3-redis python-mysqldb
\
python3-crypto python3-natsort python3-aiohttp python3-aioredis supervisor
\
python3-ipy python3-django-taggit python3-iso8601 python3-robot-detection
\
python3-sqlparse
python3-pydotplus
python3-sqlparse
# COPY requirements.txt /tmp/
COPY
requirements_dev.txt /tmp/requirements.txt
COPY
requirements.txt /tmp/
RUN
cd
/tmp
&&
pip3
install
-r
requirements.txt
&&
rm
requirements.txt
COPY
. /opt/allgo
...
...
django/config/settings.py
View file @
7e28d952
...
...
@@ -115,7 +115,6 @@ THIRD_PARTY_APPS = [
'allauth.socialaccount'
,
'allauth.socialaccount.providers.gitlab'
,
'taggit'
,
'django_extensions'
,
]
LOCAL_APPS
=
[
'main'
,
...
...
django/docs/generate_models_png.sh
deleted
100644 → 0
View file @
ef8ad721
#! /bin/bash
# TODO: the command should be placed in the Makefile or an official doc.
# It should be ran in the django container.
# cf https://django-extensions.readthedocs.io/en/latest/graph_models.html
python3 ./manage.py graph_models
--all-applications
--group-models
--output
allgo_model.png
django/docs/models.png
deleted
100644 → 0
View file @
ef8ad721
626 KB
django/requirements_dev.txt
View file @
7e28d952
...
...
@@ -9,5 +9,3 @@ pytest==3.4.2
click==6.7
pypandoc==1.4
beautifulsoup4==4.6.0
python-jose==2.0.2
django-extensions
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment