Skip to content

Commit

Permalink
Merge pull request #781 from inducer/master-to-main
Browse files Browse the repository at this point in the history
Master to main
  • Loading branch information
inducer authored Mar 8, 2021
2 parents 5c4ae66 + d50a343 commit f4e8dee
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
schedule:
- cron: "17 3 * * 0"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ bulk-storage
/.coverage
/coverage.xml
/.vscode/
/.venv/
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ RELATE

Relate is an Environment for Learning And TEaching

.. image:: https://gitlab.tiker.net/inducer/relate/badges/master/pipeline.svg
.. image:: https://gitlab.tiker.net/inducer/relate/badges/main/pipeline.svg
:alt: Gitlab Build Status
:target: https://gitlab.tiker.net/inducer/relate/commits/master
.. image:: https://github.com/inducer/relate/workflows/CI/badge.svg?branch=master
:target: https://gitlab.tiker.net/inducer/relate/commits/main
.. image:: https://github.com/inducer/relate/workflows/CI/badge.svg?branch=main
:alt: Github Build Status
:target: https://github.com/inducer/relate/actions?query=branch%3Amaster+workflow%3ACI
.. image:: https://codecov.io/gh/inducer/relate/branch/master/graph/badge.svg
:target: https://github.com/inducer/relate/actions?query=branch%3Amain+workflow%3ACI
.. image:: https://codecov.io/gh/inducer/relate/branch/main/graph/badge.svg
:alt: Codecov Coverage Status
:target: https://codecov.io/gh/inducer/relate/commits
.. image:: https://badge.fury.io/py/relate-courseware.png
:alt: Python Package Index Release Page
:target: https://pypi.org/project/relate-courseware/

+----------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+
| .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot.png | .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot-2.png |
| .. image:: https://raw.githubusercontent.com/inducer/relate/main/doc/images/screenshot.png | .. image:: https://raw.githubusercontent.com/inducer/relate/main/doc/images/screenshot-2.png |
+----------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+

RELATE is a web-based courseware package. It is set apart by the following
Expand Down

0 comments on commit f4e8dee

Please sign in to comment.