diff --git a/pagure/ui/admin.py b/pagure/ui/admin.py index 7b076a2..1b1b7b5 100644 --- a/pagure/ui/admin.py +++ b/pagure/ui/admin.py @@ -43,6 +43,7 @@ def admin_required(function): # Application +@APP.route('/admin/') @APP.route('/admin') @admin_required def admin_index(): diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 065cf82..c53b7ef 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -130,6 +130,7 @@ def index(): @APP.route('/users/') +@APP.route('/users') def view_users(): """ Present the list of users. """ @@ -158,6 +159,7 @@ def view_users(): ) +@APP.route('/user//') @APP.route('/user/') def view_user(username): """ Front page of a specific user. @@ -225,6 +227,7 @@ def view_user(username): @APP.route('/new/', methods=('GET', 'POST')) +@APP.route('/new', methods=('GET', 'POST')) @cla_required def new_project(): """ Form to create a new project. @@ -263,6 +266,7 @@ def new_project(): @APP.route('/settings/', methods=('GET', 'POST')) +@APP.route('/settings', methods=('GET', 'POST')) @cla_required def user_settings(): """ Update the user settings. @@ -368,6 +372,7 @@ def remove_user_email(): return flask.redirect(flask.url_for('.user_settings')) +@APP.route('/settings/email/add/', methods=['GET', 'POST']) @APP.route('/settings/email/add', methods=['GET', 'POST']) @cla_required def add_user_email(): @@ -454,6 +459,7 @@ def set_default_email(): return flask.redirect(flask.url_for('.user_settings')) +@APP.route('/settings/email/confirm//') @APP.route('/settings/email/confirm/') def confirm_email(token): """ Confirm a new email. @@ -481,6 +487,7 @@ def confirm_email(token): return flask.redirect(flask.url_for('.user_settings')) +@APP.route('/ssh_info/') @APP.route('/ssh_info') def ssh_hostkey(): """ Endpoint returning information about the SSH hostkey and fingerprint diff --git a/pagure/ui/docs.py b/pagure/ui/docs.py index 5979e45..c4f2362 100644 --- a/pagure/ui/docs.py +++ b/pagure/ui/docs.py @@ -73,10 +73,12 @@ def __get_tree_and_content(repo_obj, commit, path): # URLs +@APP.route('//docs/') @APP.route('//docs') @APP.route('//docs/') @APP.route('//docs/') @APP.route('//docs//') +@APP.route('/fork///docs/') @APP.route('/fork///docs') @APP.route('/fork///docs/') @APP.route('/fork///docs/') diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 7739460..7a0ae16 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -40,7 +40,9 @@ def _get_parent_repo_path(repo): return parentpath +@APP.route('//pull-requests/') @APP.route('//pull-requests') +@APP.route('/fork///pull-requests/') @APP.route('/fork///pull-requests') def request_pulls(repo, username=None): """ Request pulling the changes from the fork into the project. @@ -99,7 +101,9 @@ def request_pulls(repo, username=None): ) +@APP.route('//pull-request//') @APP.route('//pull-request/') +@APP.route('/fork///pull-request//') @APP.route('/fork///pull-request/') def request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. @@ -588,8 +592,12 @@ def fork_project(repo, username=None): return flask.redirect(flask.url_for('view_repo', repo=repo.name)) +@APP.route('//diff/../', + methods=('GET', 'POST')) @APP.route('//diff/..', methods=('GET', 'POST')) +@APP.route('/fork///diff/../', + methods=('GET', 'POST')) @APP.route('/fork///diff/..', methods=('GET', 'POST')) @cla_required diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py index f0c26f0..c19d244 100644 --- a/pagure/ui/groups.py +++ b/pagure/ui/groups.py @@ -20,6 +20,7 @@ import pagure.lib # pylint: disable=E1101 +@pagure.APP.route('/groups/') @pagure.APP.route('/groups') def group_lists(): ''' List all the groups associated with all the projects. ''' @@ -47,6 +48,7 @@ def group_lists(): ) +@pagure.APP.route('/group//', methods=['GET', 'POST']) @pagure.APP.route('/group/', methods=['GET', 'POST']) def view_group(group): ''' Displays information about this group. ''' @@ -179,6 +181,7 @@ def group_delete(group): return flask.redirect(flask.url_for('.group_lists')) +@pagure.APP.route('/group/add/', methods=['GET', 'POST']) @pagure.APP.route('/group/add', methods=['GET', 'POST']) @pagure.cla_required def add_group(): diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 98a2545..8184343 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -29,7 +29,10 @@ from pagure import (APP, SESSION, LOG, __get_file_in_tree, cla_required, # URLs +@APP.route('//issue//update/', methods=['GET', 'POST']) @APP.route('//issue//update', methods=['GET', 'POST']) +@APP.route('/fork///issue//update/', + methods=['GET', 'POST']) @APP.route('/fork///issue//update', methods=['GET', 'POST']) @cla_required @@ -192,7 +195,9 @@ def update_issue(repo, issueid, username=None): 'view_issue', username=username, repo=repo.name, issueid=issueid)) +@APP.route('//tag//edit/', methods=('GET', 'POST')) @APP.route('//tag//edit', methods=('GET', 'POST')) +@APP.route('/fork///tag//edit/', methods=('GET', 'POST')) @APP.route('/fork///tag//edit', methods=('GET', 'POST')) @cla_required def edit_tag(repo, tag, username=None): @@ -281,7 +286,9 @@ def remove_tag(repo, username=None): ) +@APP.route('//issues/') @APP.route('//issues') +@APP.route('/fork///issues/') @APP.route('/fork///issues') def view_issues(repo, username=None): """ List all issues associated to a repo @@ -367,7 +374,9 @@ def view_issues(repo, username=None): ) +@APP.route('//new_issue/', methods=('GET', 'POST')) @APP.route('//new_issue', methods=('GET', 'POST')) +@APP.route('/fork///new_issue/', methods=('GET', 'POST')) @APP.route('/fork///new_issue', methods=('GET', 'POST')) @cla_required def new_issue(repo, username=None): @@ -444,7 +453,9 @@ def new_issue(repo, username=None): ) +@APP.route('//issue//') @APP.route('//issue/') +@APP.route('/fork///issue//') @APP.route('/fork///issue/') def view_issue(repo, issueid, username=None): """ List all issues associated to a repo @@ -532,7 +543,10 @@ def delete_issue(repo, issueid, username=None): 'view_issue', username=username, repo=repo.name, issueid=issueid)) +@APP.route('//issue//edit/', methods=('GET', 'POST')) @APP.route('//issue//edit', methods=('GET', 'POST')) +@APP.route('/fork///issue//edit/', + methods=('GET', 'POST')) @APP.route('/fork///issue//edit', methods=('GET', 'POST')) @cla_required diff --git a/pagure/ui/login.py b/pagure/ui/login.py index 1f4a074..0167c02 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -27,6 +27,7 @@ from pagure.ui.admin import admin_required # pylint: disable=E1101 +@APP.route('/user/new/', methods=['GET', 'POST']) @APP.route('/user/new', methods=['GET', 'POST']) def new_user(): """ Create a new user. @@ -139,6 +140,7 @@ def do_login(): return flask.redirect(flask.url_for('auth_login')) +@APP.route('/confirm//') @APP.route('/confirm/') def confirm_user(token): """ Confirm a user account. @@ -163,6 +165,7 @@ def confirm_user(token): return flask.redirect(flask.url_for('index')) +@APP.route('/password/lost/', methods=['GET', 'POST']) @APP.route('/password/lost', methods=['GET', 'POST']) def lost_password(): """ Method to allow a user to change his/her password assuming the email @@ -208,6 +211,7 @@ def lost_password(): ) +@APP.route('/password/reset//', methods=['GET', 'POST']) @APP.route('/password/reset/', methods=['GET', 'POST']) def reset_password(token): """ Method to allow a user to reset his/her password. diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index f72d1a6..df090e9 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -44,10 +44,16 @@ def get_plugin(plugin_name): return plugin +@APP.route('//settings//', methods=('GET', 'POST')) @APP.route('//settings/', methods=('GET', 'POST')) +@APP.route('//settings///', methods=('GET', 'POST')) @APP.route('//settings//', methods=('GET', 'POST')) +@APP.route('/fork///settings//', + methods=('GET', 'POST')) @APP.route('/fork///settings/', methods=('GET', 'POST')) +@APP.route('/fork///settings///', + methods=('GET', 'POST')) @APP.route('/fork///settings//', methods=('GET', 'POST')) @cla_required diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 4ff4b19..ac0d5cc 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -41,7 +41,9 @@ from pagure import (APP, SESSION, LOG, __get_file_in_tree, cla_required, # pylint: disable=E1101 +@APP.route('//') @APP.route('/') +@APP.route('/fork///') @APP.route('/fork//') def view_repo(repo, username=None): """ Front page of a specific repo. @@ -471,7 +473,9 @@ def view_raw_file(repo, identifier, filename=None, username=None): return (data, 200, headers) +@APP.route('///') @APP.route('//') +@APP.route('/fork////') @APP.route('/fork///') def view_commit(repo, commitid, username=None): """ Render a commit in a repo @@ -541,8 +545,10 @@ def view_commit_patch(repo, commitid, username=None): @APP.route('//tree/') +@APP.route('//tree') @APP.route('//tree/') @APP.route('/fork///tree/') +@APP.route('/fork///tree') @APP.route('/fork///tree/') def view_tree(repo, identifier=None, username=None): """ Render the tree of the repo @@ -592,7 +598,9 @@ def view_tree(repo, identifier=None, username=None): ) +@APP.route('//forks/') @APP.route('//forks') +@APP.route('/fork///forks/') @APP.route('/fork///forks') def view_forks(repo, username=None): """ Presents all the forks of the project. @@ -610,7 +618,9 @@ def view_forks(repo, username=None): ) +@APP.route('//settings/', methods=('GET', 'POST')) @APP.route('//settings', methods=('GET', 'POST')) +@APP.route('/fork///settings/', methods=('GET', 'POST')) @APP.route('/fork///settings', methods=('GET', 'POST')) @cla_required def view_settings(repo, username=None): @@ -843,7 +853,9 @@ def remove_user(repo, userid, username=None): ) +@APP.route('//adduser/', methods=('GET', 'POST')) @APP.route('//adduser', methods=('GET', 'POST')) +@APP.route('/fork///adduser/', methods=('GET', 'POST')) @APP.route('/fork///adduser', methods=('GET', 'POST')) @cla_required def add_user(repo, username=None): @@ -895,7 +907,9 @@ def add_user(repo, username=None): ) +@APP.route('//addgroup/', methods=('GET', 'POST')) @APP.route('//addgroup', methods=('GET', 'POST')) +@APP.route('/fork///addgroup/', methods=('GET', 'POST')) @APP.route('/fork///addgroup', methods=('GET', 'POST')) @cla_required def add_group_project(repo, username=None): @@ -992,7 +1006,9 @@ def regenerate_git(repo, username=None): ) +@APP.route('//token/new/', methods=('GET', 'POST')) @APP.route('//token/new', methods=('GET', 'POST')) +@APP.route('/fork///token/new/', methods=('GET', 'POST')) @APP.route('/fork///token/new', methods=('GET', 'POST')) @cla_required def add_token(repo, username=None):