diff --git a/.dockerignore b/.dockerignore index ae09cac975..e332b562dc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,7 @@ __pycache__ .vagrant .pytest_cache .github +.gitlab .cache Vagrantfile .coverage diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8b803acade..36152fc5d7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,18 +7,17 @@ contributions may be rejected on the basis of a contributor failing to follow th ## Rules 1. **No force-pushes** or modifying the Git history in any way. -1. If you have direct access to the repository, **create a branch for your changes** and create a pull request for that branch. +1. If you have direct access to the repository, **create a branch for your changes** and create a merge request for that branch. If not, fork it and work on a separate branch there. * Some repositories require this and will reject any direct pushes to `master`. Make this a habit! -1. If someone is working on a pull request, **do not open your own pull request for the same task**. Instead, leave some comments - on the existing pull request. Communication is key, and there's no point in two separate implementations of the same thing. +1. If someone is working on a merge request, **do not open your own merge request for the same task**. Instead, leave some comments + on the existing merge request. Communication is key, and there's no point in two separate implementations of the same thing. * One option is to fork the other contributor's repository, and submit your changes to their branch with your - own pull request. If you do this, we suggest following these guidelines when interacting with their repository + own merge request. If you do this, we suggest following these guidelines when interacting with their repository as well. 1. **Adhere to the prevailing code style**, which we enforce using [flake8](http://flake8.pycqa.org/en/latest/index.html). * Additionally, run `flake8` against your code before you push it. Your commit will be rejected by the build server - if it fails to lint. For an automatic way to do this, check out - [our article on Git hooks](https://github.com/discord-python/site/wiki/Git-Hooks). + if it fails to lint. 1. **Don't fight the framework**. Every framework has its flaws, but the frameworks we've picked out have been carefully chosen for their particular merits. If you can avoid it, please resist reimplementing swathes of framework logic - the work has already been done for you! diff --git a/bot/cogs/bot.py b/bot/cogs/bot.py index 6d574d0b16..af9abd7cb5 100644 --- a/bot/cogs/bot.py +++ b/bot/cogs/bot.py @@ -56,7 +56,7 @@ async def info(self, ctx: Context): embed = Embed( description="A utility bot designed just for the Python server! Try `bot.help()` for more info.", - url="https://github.com/discord-python/bot" + url="https://gitlab.com/discord-python/projects/bot" ) repo = Repo(".") @@ -67,7 +67,7 @@ async def info(self, ctx: Context): embed.set_author( name="Python Bot", - url="https://github.com/discord-python/bot", + url="https://gitlab.com/discord-python/projects/bot", icon_url=URLs.bot_avatar ) diff --git a/bot/cogs/cogs.py b/bot/cogs/cogs.py index 51693f9ef1..7eaf5005cf 100644 --- a/bot/cogs/cogs.py +++ b/bot/cogs/cogs.py @@ -51,7 +51,7 @@ async def load_command(self, ctx: Context, cog: str): embed.set_author( name="Python Bot (Cogs)", - url=URLs.github_bot_repo, + url=URLs.gitlab_bot_repo, icon_url=URLs.bot_avatar ) @@ -108,7 +108,7 @@ async def unload_command(self, ctx: Context, cog: str): embed.set_author( name="Python Bot (Cogs)", - url=URLs.github_bot_repo, + url=URLs.gitlab_bot_repo, icon_url=URLs.bot_avatar ) @@ -163,7 +163,7 @@ async def reload_command(self, ctx: Context, cog: str): embed.set_author( name="Python Bot (Cogs)", - url=URLs.github_bot_repo, + url=URLs.gitlab_bot_repo, icon_url=URLs.bot_avatar ) @@ -264,7 +264,7 @@ async def list_command(self, ctx: Context): embed.colour = Colour.blurple() embed.set_author( name="Python Bot (Cogs)", - url=URLs.github_bot_repo, + url=URLs.gitlab_bot_repo, icon_url=URLs.bot_avatar ) diff --git a/bot/cogs/logging.py b/bot/cogs/logging.py index 05fed70420..67f09dc8a9 100644 --- a/bot/cogs/logging.py +++ b/bot/cogs/logging.py @@ -23,7 +23,7 @@ async def on_ready(self): embed = Embed(description="Connected!") embed.set_author( name="Python Bot", - url="https://github.com/discord-python/bot", + url="https://gitlab.com/discord-python/projects/bot", icon_url="https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle.png" ) diff --git a/bot/cogs/snakes.py b/bot/cogs/snakes.py index 78be08faba..ec32a119dd 100644 --- a/bot/cogs/snakes.py +++ b/bot/cogs/snakes.py @@ -140,7 +140,7 @@ class Snakes: More information can be found in the code-jam-1 repo. - https://github.com/discord-python/code-jam-1 + https://gitlab_bot_repo.com/discord-python/code-jams/code-jam-1 """ wiki_brief = re.compile(r'(.*?)(=+ (.*?) =+)', flags=re.DOTALL) @@ -981,7 +981,7 @@ async def snake_about(self, ctx: Context): title="About the snake cog", description=( "The features in this cog were created by members of the community " - "during our first ever [code jam event](https://github.com/discord-python/code-jam-1). \n\n" + "during our first ever [code jam event](https://gitlab.com/discord-python/code-jams/code-jam-1). \n\n" "The event saw over 50 participants, who competed to write a discord bot cog with a snake theme over " "48 hours. The staff then selected the best features from all the best teams, and made modifications " "to ensure they would all work together before integrating them into the community bot.\n\n" diff --git a/bot/constants.py b/bot/constants.py index c512480c56..eec150d1ac 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -256,7 +256,7 @@ class URLs(metaclass=YAMLGetter): site_names_api: str site_idioms_api: str site_special_api: str - github_bot_repo: str + gitlab_bot_repo: str bot_avatar: str omdb: str diff --git a/config-default.yml b/config-default.yml index 3a20d10c66..eb0f86d2fc 100644 --- a/config-default.yml +++ b/config-default.yml @@ -75,6 +75,6 @@ urls: site_names_api: 'https://api.pythondiscord.com/bot/snake_names' site_idioms_api: 'https://api.pythondiscord.com/bot/snake_idioms' site_special_api: 'https://api.pythondiscord.com/bot/special_snakes' - github_bot_repo: 'https://github.com/discord-python/bot' + gitlab_bot_repo: 'https://gitlab.com/discord-python/projects/bot' bot_avatar: 'https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle/logo_circle.png' omdb: 'http://omdbapi.com'