Skip to content

Commit

Permalink
🚚 chore: Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
abhiabhi94 committed Mar 10, 2021
1 parent e6a1324 commit 29b0a76
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
- DJANGO=2.2
- DJANGO=3.0
- DJANGO=3.1
- DJANGO=master
- DJANGO=main

install: pip install tox-travis coveralls
script:
Expand All @@ -27,4 +27,5 @@ jobs:
password:
secure: u9OkdMaFzq/IE+ioARENz57DGYAOAQer4qpvdfAnL4KNR91Dw6E61V8m/BX3R6rnKldMoXMpzSXWQLmEqcnU5x00uO2P2f///gSbCp79KZzXhc7SmTYMiDfgeQ8t4GPx3YK6gPluG4Js46DDBhlTW6wDht0vg9I5KfzrcbGLQ5PHGT+S5YXBDRd32YxTbFDHo0/rgJbslWbPTCTuRlOLhXh0TYnoS3IYguDzEMB2Vnq4eW0I1npQlrZtzVCYh9kgRCmaalEgZ9P7X013U649OUXisb5V3pRdEa9+jfGNK14tLEuiIZjqr4lLKmoCq/wlT5sPFG1M29B0JmP22fAO7cQSxJq2Kl+P3o3QHEZ+PJqN9bgi+Yn+HDabyWel731gCA2UPaeS2qoppSJrxfAOIwgtPoQs7XP2+ml803A4F3P9EF6odery4GFR57kll5aJGlGC9dxHKGY0NO77vtPKZQscW90DiFXRmNEtFCvkarOJLvVCiNHiJww3TxkzBS+eRTkTTN0rRRT6nNMlfSlSTVX83ggDboCFHMMarOzeOQRq1V6n1RheME6P+u31bNSq0Swh+I95MvvFJdmu4dlSCc/pAQ5pOZ9HZmLc0cwkNaaQ8m1ZkhqhFDySvlXhTKslANnxCaXuRRTAWso+1tfSpY9LmYHW00kgRX647C1yYhA=
on:
branch: main
tags: true
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
django-flag-app
===============

.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=master
.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=main
:target: https://travis-ci.org/abhiabhi94/django-flag-app
:alt: build

Expand All @@ -27,21 +27,21 @@ django-flag-app
:alt: docs

.. image:: https://img.shields.io/github/license/abhiabhi94/django-flag-app?color=gr
:target: https://github.com/abhiabhi94/django-flag-app/blob/master/LICENSE
:target: https://github.com/abhiabhi94/django-flag-app/blob/main/LICENSE
:alt: licence


A pluggable django application that adds the ability for users to flag(or report) your models.


.. image:: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/_static/images/django-flag-app.gif
.. image:: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/_static/images/django-flag-app.gif
:alt: flagging-process


For complete documentation you may visit `Read the Doc`_. or see the `docs`_ directory.

.. _Read the Doc: https://django-flag-app.readthedocs.io
.. _docs: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/
.. _docs: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/

Installation
------------
Expand Down Expand Up @@ -128,7 +128,7 @@ Use template tag

If you want to use web API, this step is not required. See further instructions at `Web API`_.

.. _Web API: https://github.com/abhiabhi94/django-flag-app/blob/master/docs/webAPI.rst
.. _Web API: https://github.com/abhiabhi94/django-flag-app/blob/main/docs/webAPI.rst

``render_flag_form`` tag requires 2 required positional arguments:

Expand All @@ -148,4 +148,4 @@ Contributing

Please see the instructions at `Contributing`_.

.. _Contributing: https://github.com/abhiabhi94/django-flag-app/blob/master/CONTRIBUTING.rst
.. _Contributing: https://github.com/abhiabhi94/django-flag-app/blob/main/CONTRIBUTING.rst
4 changes: 2 additions & 2 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
django-flag-app
===============

.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=master
.. image:: https://travis-ci.org/abhiabhi94/django-flag-app.svg?branch=main
:target: https://travis-ci.org/abhiabhi94/django-flag-app
:alt: build

Expand All @@ -26,7 +26,7 @@ django-flag-app
:alt: docs

.. image:: https://img.shields.io/github/license/abhiabhi94/django-flag-app?color=gr
:target: https://github.com/abhiabhi94/django-flag-app/blob/master/LICENSE
:target: https://github.com/abhiabhi94/django-flag-app/blob/main/LICENSE
:alt: licence

A pluggable django application that adds the ability for users to flag(or report) your models.
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{36,37,38}-{dj21, dj22, dj30, dj31, djmaster}
py{36,37,38}-{dj21, dj22, dj30, dj31, djmain}

[travis]
python =
Expand All @@ -14,7 +14,7 @@ DJANGO =
2.2: dj22
3.0: dj30
3.1: dj31
master: djmaster
main: djmain

[testenv]
deps =
Expand All @@ -26,7 +26,7 @@ deps =
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
djmaster: https://github.com/django/django/archive/master.tar.gz
djmain: https://github.com/django/django/archive/main.tar.gz

usedevelop = True

Expand Down

0 comments on commit 29b0a76

Please sign in to comment.