Apache Allura™

• status: in-progress --> code-review
• assigned_to: Tim Van Steenburgh --> Dave Brondsema
• size: --> 2

forge:tv/2689

On a sandbox, login as admin1. Make sure you have the 'test' project, with the Git tool, mounted at 'code'. If not, adjust the following instructions for your project name and git mount point.

$ cd ~
$ git clone /git/p/test/code test-code
$ cd test-code
$ echo readme >> readme
$ git add .
$ git ci -m 'Added readmre.'
$ git push origin master

Now browse to /p/test/code. Click the Fork button and fork the repo to your user project, with repo name 'code'. Now commit to your fork:

$ cd ~
$ git clone /git/u/admin1/code admin1-code
$ cd admin1-code
$ echo documentation >> docs
$ git add .
$ git ci -m 'Added docs.'
$ git push origin master

Now browse to your fork at /u/admin1/code. Click the Request Merge button. Complete the form and submit. You'll be redirected to a page detailing your merge request.

You can do these same steps for a Mercurial repo, although there are functional tests to cover both Git and Mercurial.

• status: code-review --> in-progress
• assigned_to: Dave Brondsema --> Tim Van Steenburgh

• need an access check before showing the "Request Merge" button in the sidebar and viewing the /request_merge URL (I can access it as anon)
• I created a git merge request, then went to an hg repo and made a merge request and got the wrong request #1 displayed. Probably need app_config_id in the queries. E.g. https://sf-dbrondsema-7020.sb.sf.net/p/test3/git/merge-requests/1/ and https://sf-dbrondsema-7020.sb.sf.net/p/test3/code/merge-requests/1/
• in the tests, r.forms[0].submit().follow() would be the detail view for a merge request right? We should also test the /merge-requests/ list view. And a status change save if you're ambitious.

These items have been fixed and the functional tests updated accordingly.

• status: in-progress --> code-review
• assigned_to: Tim Van Steenburgh --> Dave Brondsema

• status: code-review --> in-progress
• assigned_to: Dave Brondsema --> Tim Van Steenburgh

• XSS vulnerability in pull-request descriptions. E.g. see "foo bar" on https://sf-dbrondsema-7020.sb.sf.net/p/test3/code/merge-requests/1/
• there are two tables of commits on that page, which seems duplicative, unless I'm missing something. The only difference I can see is that the top table has a "Tree" link

Nevermind the XSS, it's just standard markdown rendering

• status: in-progress --> code-review
• assigned_to: Tim Van Steenburgh --> Dave Brondsema

Removed the redundant list of commits.

• status: code-review --> closed

• milestone: forge-sept-30 --> forge-sep-16