diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 0fcce2f94..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This is a configuration file to run GitLab's CI integration -# You can find more info on how to set it up in these URLS -# -# http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html -# http://docs.gitlab.com/ce/ci/yaml/README.html -# -# You'll need to manually provide info on how to setup and connect to your database, -# unless it's SQLite, so please, consider this as a starting point and not an end to end -# solution - - -# Select image from https://hub.docker.com/ -image: python:3.5 - -all_tests: - script: - - sh {{cookiecutter.project_slug}}/utility/install_os_dependencies.sh - - sh {{cookiecutter.project_slug}}/utility/install_python_dependencies.sh - - python manage.py test -k - when: on_success - only: - - dev diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index a1cbdfc19..4fe615628 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -35,6 +35,7 @@ Listed in alphabetical order. ========================== ============================ ============== Name Github Twitter ========================== ============================ ============== + 18 `@dezoito`_ a7p `@a7p`_ Aaron Eikenberry `@aeikenberry`_ Adam BogdaƂ `@bogdal`_ @@ -112,6 +113,7 @@ Listed in alphabetical order. Yaroslav Halchenko ========================== ============================ ============== +.. _@dezoito: https://github.com/dezoito .. _@a7p: https://github.com/a7p .. _@ad-m: https://github.com/ad-m .. _@aeikenberry: https://github.com/aeikenberry diff --git a/README.rst b/README.rst index 4b4d3af15..1a8f860f0 100644 --- a/README.rst +++ b/README.rst @@ -217,6 +217,7 @@ Articles * `Development and Deployment of Cookiecutter-Django via Docker`_ - Dec. 29, 2015 * `How to create a Django Application using Cookiecutter and Django 1.8`_ - Sept. 12, 2015 * `Introduction to Cookiecutter-Django`_ - Feb. 19, 2016 +* `Django and GitLab - Running Continuous Integration and tests with your FREE account`_ - May. 11, 2016 Got a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link. @@ -224,6 +225,7 @@ Got a blog or online publication? Write about your cookiecutter-django tips and .. _`Development and Deployment of Cookiecutter-Django on Fedora`: https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-on-fedora/ .. _`How to create a Django Application using Cookiecutter and Django 1.8`: http://blog.swapps.co/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/#.VxKfBpMrKRs .. _`Introduction to Cookiecutter-Django`: http://krzysztofzuraw.com/blog/2016/django-cookiecutter.html +.. _`Django and GitLab - Running Continuous Integration and tests with your FREE account`: http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html Support This Project ---------------------------