You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2016/04/06 21:02:47 UTC
allura git commit: [#8072] Changed 'asked you to merge' text to
'wants to merge'
Repository: allura
Updated Branches:
refs/heads/master 43bfe22a1 -> e1a2adfce
[#8072] Changed 'asked you to merge' text to 'wants to merge'
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e1a2adfc
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e1a2adfc
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e1a2adfc
Branch: refs/heads/master
Commit: e1a2adfce1d7873795b37afeb2eac56554a8b5f2
Parents: 43bfe22
Author: rhnvrm <ro...@gmail.com>
Authored: Sun Apr 3 00:44:23 2016 +0530
Committer: Heith Seewald <he...@gmail.com>
Committed: Wed Apr 6 14:58:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/repo/merge_request.html | 2 +-
ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e1a2adfc/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 82af027..cccd92f 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -56,7 +56,7 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
{% if req.downstream_repo %}
<p>
<a href="{{req.creator_url}}">{{req.creator_name}}</a>
- asked you to merge {{h.text.plural(commits|count, 'commit', 'commits')}}
+ wants to merge {{h.text.plural(commits|count, 'commit', 'commits')}}
from <a href="{{req.downstream_url}}">{{req.downstream_url}}</a>
to {{ req.target_branch }},
{{lib.abbr_date(req.mod_date)}}
http://git-wip-us.apache.org/repos/asf/allura/blob/e1a2adfc/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 9cc9b79..6d05094 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -601,7 +601,7 @@ class TestFork(_TestCase):
def test_merge_request_detail_view(self):
r, mr_num = self._request_merge()
- assert 'asked you to merge' in r, r.showbrowser()
+ assert 'wants to merge' in r, r.showbrowser()
assert 'Improve documentation' in r, r.showbrowser()
revs = r.html.findAll('tr', attrs={'class': 'rev'})
assert_equal(len(revs), 1)