This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
discard abe7dc109 fixup! SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 6215f50f2 fixup! SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 8e09095a1 fixup! SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
discard 29abda80e SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
discard 3cf3e0c3f SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 5c57db8d4 SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
discard 9a0aec7b0 SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
discard f13736bc6 SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its
deps: future,webob
discard a292c0b1e SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its
deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
discard ea2e270b6 SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade,
and its deps: regex
discard bb9f358a0 SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
discard e83ef6580 SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
discard 6aa863948 SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps:
requests,certifi,charset-normalizer,idna,urllib3
discard 92aad2113 SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps:
bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
discard 21e28a4f0 SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
discard 208689a03 SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
discard acc7f35a0 SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps:
paste,setuptools,six,PasteDeploy,six
discard d56fb4e5b SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
discard 7c1abee80 SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps:
importlib-metadata,typing-extensions,zipp
discard 80d077f57 SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps:
gitdb,smmap,typing-extensions
discard 744463a39 SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its
deps: pytz
discard 4bfe8387d SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
discard 97bba3e72 SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
discard 5baf65f33 SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps:
cffi,pycparser
discard 966545386 SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps:
iso8601,setuptools,translationstring
discard d2c0aed80 SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its
deps: soupsieve
add 2a7c6047f [#8425] upgrade jinja to 3.1.1
new 600c19648 SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its
deps: soupsieve
new adc2bbc2a SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps:
iso8601,setuptools,translationstring
new eb43b8de7 SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps:
cffi,pycparser
new c729ec28b SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
new a29031d57 SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
new 480af62bc SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its
deps: pytz
new d207efb88 SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps:
gitdb,smmap,typing-extensions
new ddd1e082f SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps:
importlib-metadata,typing-extensions,zipp
new 1288055af SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
new 092e9f6bc SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps:
paste,setuptools,six,PasteDeploy,six
new 6339ff7ec SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
new 2261754a4 SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
new 1039980ea SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps:
bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
new 800b12b16 SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps:
requests,certifi,charset-normalizer,idna,urllib3
new 2aa8b28c5 SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
new fe613cada SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
new 25555596a SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade,
and its deps: regex
new 0e4ede5a7 SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its
deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
new 9bf8b037d SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its
deps: future,webob
new fc08e08ad SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
new fdab7b596 SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
new a43963002 SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
new 66c3ffe85 SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (abe7dc109)
\
N -- N -- N refs/heads/dw/8426 (66c3ffe85)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 23 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Allura/allura/controllers/project.py | 5 +++--
Allura/allura/lib/app_globals.py | 2 +-
Allura/allura/lib/helpers.py | 2 +-
Allura/allura/lib/macro.py | 3 ++-
Allura/allura/lib/phone/nexmo.py | 3 ++-
Allura/allura/lib/search.py | 15 ++++++++-------
Allura/allura/lib/widgets/user_profile.py | 4 ++--
Allura/allura/model/discuss.py | 3 ++-
Allura/allura/tests/test_globals.py | 2 +-
Allura/allura/tests/test_helpers.py | 2 +-
ForgeTracker/forgetracker/model/ticket.py | 9 +++++----
requirements.txt | 4 ++--
12 files changed, 30 insertions(+), 24 deletions(-)
