Ticket search results

API for merge requests

Dave Brondsema — Mon, 17 Sep 2018 22:16:48 -0000

Merge requests should notify the submitter of changes HAS MIGRATION SCRIPT

Dave Brondsema — Mon, 05 Feb 2018 17:01:04 -0000

The person that submits a merge request should get subscribed to it. Would be nice to have a subscribe icon button also, so that other people can subscribe (like tickets etc work). We'll have to adjust the message text a bit, the word "you" here is directed at project admins only: > has requested that you merge changes

Fix subscriptions logic & UI for merge requests

Dave Brondsema — Wed, 27 Sep 2017 18:04:05 -0000

When I create a new merge request, I am not subscribed automatically to it. I should be. Only after I post a comment do I get subscribed to it. There should be a icon in the toolbar area to subscribe and unsubscribe from a merge request, just like you can for a ticket. On the "browse" pages for the repo, there is an icon to subscribe you to the whole tool. We might want to move that to the sidebar, like we do for the wiki. (Separate subscriptions to all commits vs all merge requests might be nice, but we don't have any way to track that)

Option to send merge requests notifications to mailing list

Dave Brondsema — Mon, 01 Aug 2016 18:24:01 -0000

Just like tickets have an option to copy notifications to a mailing list, it would be good for merge requests to have that option also.

Show merge requests in sidebar, even if there are 0

Dave Brondsema — Tue, 28 Jun 2016 14:36:10 -0000

This would make it easier for people to know that they even exist. Also, its more consistent, so you can find them when they are all closed, etc.

Missing notification when using the one-click merge button

Dave Brondsema — Tue, 05 Jul 2016 19:36:20 -0000

When using the one-click merge button, the status change is not recorded in the comments and thus not sent out as a notification either.

Change "asked you to merge" text

Dave Brondsema — Wed, 06 Apr 2016 19:33:31 -0000

On merge requests, it always says "$USER asked you to merge ....". The word "you" only makes sense if you have access to merge the request, we shouldn't show it to everyone else (including the contributor). Pick a different phrase that works better for everyone.

Better email subjects for merge request updates

Dave Brondsema — Mon, 05 Feb 2018 17:01:12 -0000

The notification of new merge requests is good, like `[allura:git] Merge request: Add login redirect to the nav "Log In" link` But notifications of any further changes (status, comment, etc) just has the number and no useful title. E.g. `[allura:git] Merge Request #78 of Apache Allura™:git.git discussion`. Those should be changed to be like the first.

Submitter should be able to reject merge request

Dave Brondsema — Mon, 14 Mar 2016 20:01:20 -0000

The submitter of a merge request should be able to change its status to "rejected" (or possibly delete it, but I think that'd be going too far). [#5993] for updating an existing request will help too, but there's still a good case for rejecting your own MR I think. This has been requested by several SF users: https://sourceforge.net/p/forge/feature-requests/254/

Don't update merge request timestamps incorrectly

Dave Brondsema — Mon, 13 Jul 2015 14:49:44 -0000

Merge request's "updated" timestamp changes when you view it and it calculates if a one-click merge is possible. That shouldn't happen. Make sure no other operations incorrectly update the timestamp either.

Better display of merged merge requests

Dave Brondsema — Wed, 20 May 2015 20:42:54 -0000

After a merge request is merged, it would be good to show it differently: * show original timestamp instead of timestamp of when MR was merged. * show original commits, instead of 0 commits * hide the instructions for manual merge

Show markdown preview/help buttons for merge requests

Dave Brondsema — Thu, 20 Aug 2015 22:06:09 -0000

The textarea when creating or editing merge requests is for markdown content, so it should have the standard preview functionality and Formatting Help buttons.

Run can_merge in background, and cache results

Dave Brondsema — Thu, 20 Aug 2015 22:06:09 -0000

We do need to run merge requests as a background task, and cache the results. Mature projects with big repos take too long to compute if they are mergable. See https://forge-allura.apache.org/p/allura/tickets/7830/#f5b2 for discussion on running in background and caching.

Config options to disable one-click merge requests

Dave Brondsema — Thu, 20 Aug 2015 22:06:09 -0000

Add a `.ini` option to disable merge requests for all git or all hg repos. Also a per-tool project admin setting to disable it. This should go on the "Checkout URL" dialog since disabling one-click merge makes most sense if the checkout url is being overridden.

Uninitialized git repo allows forking.

Anonymous — Thu, 20 Aug 2015 22:07:00 -0000

*Originally created by:* algorithms Uninitialized repositories should not allow you to for them since you cannot create a merge request for an uninitialized repository.

Bigger text inputs for merge requests

Dave Brondsema — Thu, 20 Aug 2015 22:07:00 -0000

For creating and editing merge requests, the summary and description fields should be a lot bigger. The edit page needs a `` too. </article> <article> <h1>Support merge requests via branches</h1> <p>Dave Brondsema — Wed, 18 Mar 2015 23:27:08 -0000</p> Allura should support merge requests that are specified by a branch in the current repo, in addition to the current way that requires a fork. </article> <article> <h1>Merge request to branch list commits against master</h1> <p>Anonymous — Thu, 20 Aug 2015 22:07:00 -0000</p> *Originally created by:* nhnb Merge request against list the target branch incorrectly list commits based on master. At the top of the merge request https://sourceforge.net/p/arianne/marauroa/merge-requests/1/ , it says correctly: "Hendrik Brummermann would like you to merge 295 commits from /u/nhnb/arianne-marauroa/ to perception_json" This particular merge request is supposed to have just one commit, but it lists all commits different from master. I forked the repository on the website, then checked the fork out locally using the perception_json branch. I created a new branch 2013_nhnb_authors, made a commit and pushed it. Then I created a pull request, selecting perception_json as target. According to wjp that commit count is comparing the branch with master instead of perception_json ~~~~ $ git log --oneline master..2013_nhnb_authors | wc -l 295 ~~~~ </article> <article> <h1>Show commits when creating a Merge Request</h1> <p>Cory Johns — Thu, 07 Jul 2016 20:46:44 -0000</p> When creating a new Merge Request, the list of commits that will be included should be shown so that the user can verify that they are choosing the correct source & target branch. The list should update if the source or target branches are changed. </article> <article> <h1>Auto-comment on ticket upon merge request</h1> <p>Cory Johns — Sat, 20 Oct 2018 12:34:42 -0000</p> If a commit in a merge request references a ticket, a comment (or at least a Related link) should be added to the ticket when the merge request is created. </article> <article> <h1>RepoLookupError on hg merge request [ss5045]</h1> <p>Dave Brondsema — Thu, 20 Aug 2015 22:06:09 -0000</p> From <https://sourceforge.net/p/forge/site-support/5045/>: > On that page, when I click any of the merge requests (and go to, say: https://sourceforge.net/p/mikmod/mercurial/merge-requests/2/ ), then I get an > > « > Error 500 > > We're sorry but we weren't able to process this request. > » > > Please correct it, preferably with a regression test. Error is: ~~~~ File '/var/local/allura/Allura/allura/templates/repo/merge_request.html', line 36 in block "content" would like you to merge {{ req.commits | count }} commits File '/var/local/env-allura/lib/python2.7/site-packages/Jinja2-2.6-py2.7.egg/jinja2/environment.py', line 372 in getattr return getattr(obj, attribute) File '/var/local/env-allura/lib/python2.7/site-packages/Ming-0.3.7-py2.7.egg/ming/utils.py', line 18 in __get__ result = obj.__dict__[self.__name__] = self._func(obj) File '/var/local/allura/Allura/allura/model/repository.py', line 601 in commits return self._commits() File '/var/local/allura/Allura/allura/model/repository.py', line 608 in _commits id_only=False)) File '/var/local/env-allura/lib/python2.7/site-packages/ForgeHg-0.1.15-py2.7.egg/forgehg/model/hg.py', line 226 in log change_revs = cmdutil.walkchangerevs(self._hg, match, {'rev': revs, 'prune': exclude}, noop) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.3-py2.7.egg/timermiddleware/__init__.py', line 120 in __call__ return self.run_and_log(self._inner, None, *args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.3-py2.7.egg/timermiddleware/__init__.py', line 125 in run_and_log return func(*args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/mercurial-1.4.3-py2.7-linux-x86_64.egg/mercurial/cmdutil.py', line 1201 in walkchangerevs rev = repo.changelog.rev(repo.lookup(rev)) File '/var/local/env-allura/lib/python2.7/site-packages/mercurial-1.4.3-py2.7-linux-x86_64.egg/mercurial/localrepo.py', line 452 in lookup raise error.RepoLookupError(_("unknown revision '%s'") % key) RepoLookupError: unknown revision '9b84ebca7a5b7fe006dc941633152828f2d26691' ~~~~ </article> <article> <h1>merge request improvement: enable mail reply</h1> <p>Anonymous — Mon, 30 Sep 2013 15:11:31 -0000</p> *Originally created by:* cpascual It would be very nice if the merge request discussions allowed replying by email (just as the tickets do). This would allow us have both the nice history tracking via the web interface while allowing agile mailing-list discusions for code review. </article> <article> <h1>Track changes to merge requests</h1> <p>Cory Johns — Thu, 20 Aug 2015 22:07:00 -0000</p> There's no automatic log of changes to merge requests. Changes should automatically create a comment, like the tracker does. </article> <article> <h1>merge requests break on log display of symbolics_for_commit</h1> <p>Dave Brondsema — Thu, 20 Aug 2015 22:07:54 -0000</p> Getting this on every merge request that has commits to show. Make sure you add a test for this, since apparently we don't have a realistic functional test of a merge request page. ~~~~ File '/var/local/allura/Allura/allura/templates/repo/merge_request.html', line 43 in block "content" {{ c.log_widget.display(value=req.commits) }} File '/var/local/env-allura/lib/python2.7/site-packages/EasyWidgets-0.2dev_20130116-py2.7.egg/ew/widget.py', line 45 in display return self.template(context) File '/var/local/env-allura/lib/python2.7/site-packages/EasyWidgets-0.2dev_20130116-py2.7.egg/ew/render.py', line 32 in __call__ return self.engine.render(self.template, context) File '/var/local/allura/Allura/allura/config/app_cfg.py', line 129 in render text = template.render(**context) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.2-py2.7.egg/timermiddleware/__init__.py', line 116 in wrapper return self.run_and_log(func, inst, *args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.2-py2.7.egg/timermiddleware/__init__.py', line 125 in run_and_log return func(*args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/Jinja2-2.6-py2.7.egg/jinja2/environment.py', line 894 in render return self.environment.handle_exception(exc_info, True) File '/var/local/allura/Allura/allura/templates/widgets/repo/log.html', line 41 in top-level template code {% if c.app.repo.symbolics_for_commit(commit)[1] %} File '/var/local/allura/Allura/allura/model/repository.py', line 315 in symbolics_for_commit return self._impl.symbolics_for_commit(commit) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.2-py2.7.egg/timermiddleware/__init__.py', line 116 in wrapper return self.run_and_log(func, inst, *args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/TimerMiddleware-0.4.2-py2.7.egg/timermiddleware/__init__.py', line 125 in run_and_log return func(*args, **kwargs) File '/var/local/allura/ForgeGit/forgegit/model/git_repo.py', line 335 in symbolics_for_commit containing_branches = self._git.git.branch(contains=commit._id) File '/var/local/env-allura/lib/python2.7/site-packages/GitPython-0.3.2.RC1_20130424-py2.7.egg/git/cmd.py', line 227 in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/GitPython-0.3.2.RC1_20130424-py2.7.egg/git/cmd.py', line 456 in _call_process return self.execute(call, **_kwargs) File '/var/local/env-allura/lib/python2.7/site-packages/GitPython-0.3.2.RC1_20130424-py2.7.egg/git/cmd.py', line 377 in execute raise GitCommandError(command, status, stderr_value) GitCommandError: 'git branch --contains=ff1a89a121c7aba721aaa8c639a3112f1788673e' returned exit status 129: error: no such commit ff1a89a121c7aba721aaa8c639a3112f1788673e ~~~~ </article> <article> <h1>Ability to edit merge requests</h1> <p>Dave Brondsema — Thu, 20 Aug 2015 22:07:00 -0000</p> If the main description of a merge request needs to be edited for some reason, there should be a way to do so </article> </main></body></html>