Ibid

Merge lp:~stefanor/ibid/factoid-390742 into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. factoid-390742
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Merged
Approved by: Jonathan Hitchcock
Approved revision: 684
Merged at revision: 686
Proposed branch: lp:~stefanor/ibid/factoid-390742
Merge into: lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target: None lines
To merge this branch: bzr merge lp:~stefanor/ibid/factoid-390742
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve
Michael Gorven Approve
Review via email: mp+8194@code.launchpad.net

This proposal supersedes a proposal from 2009-07-03.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote : Posted in a previous version of this proposal

Hmm, why was this never proposed?

Revision history for this message
Stefano Rivera (stefanor) wrote :

Had to rebase to get mergeable:
Query: c++ is hi
Response: Sure
Query: c++
Response: c++ is hi
Query: c++ [[ it rocks ]]
Response: Karma must be done in public

Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve

review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/factoid.py'
2--- ibid/plugins/factoid.py 2009-07-03 17:16:02 +0000
3+++ ibid/plugins/factoid.py 2009-06-22 16:44:14 +0000
4@@ -327,7 +327,7 @@
5 u"""<factoid> [( #<number> | /<pattern>/[r] )]"""
6 feature = 'factoids'
7
8- priority = 900
9+ priority = 200
10
11 interrogatives = Option('interrogatives', 'Question words to strip', default_interrogatives)
12 verbs = Option('verbs', 'Verbs that split name from value', default_verbs)
13@@ -460,7 +460,7 @@
14
15 permission = u'factoid'
16 permissions = (u'factoidadmin',)
17- priority = 890
18+ priority = 190
19
20 @match(r'^(.+?)(?:\s+#(\d+)|\s+/(.+?)/(r?))?\s*\+=(.+)$', version='deaddressed')
21 @authorise

Subscribers

People subscribed via source and target branches