##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2487:fcee5614 default
r2784:e8c62649 default
Show More
__init__.py
46 lines | 1.6 KiB | text/x-python | PythonLexer
core: added ops view to pyramid to have a PING command with pure pyramid.
r1669 # -*- coding: utf-8 -*-
release: update copyright year to 2018
r2487 # Copyright (C) 2016-2018 RhodeCode GmbH
core: added ops view to pyramid to have a PING command with pure pyramid.
r1669 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
apps: switch import of ADMIN_PREFIX from routing into base app....
r2309 from rhodecode.apps._base import ADMIN_PREFIX
core: added ops view to pyramid to have a PING command with pure pyramid.
r1669
def admin_routes(config):
config.add_route(
name='ops_ping',
pattern='/ping')
ops: added redirect and exception ops view for testing.
r1913 config.add_route(
name='ops_error_test',
pattern='/error')
config.add_route(
name='ops_redirect_test',
pattern='/redirect')
core: added ops view to pyramid to have a PING command with pure pyramid.
r1669
def includeme(config):
config.include(admin_routes, route_prefix=ADMIN_PREFIX + '/ops')
pylons: remove pylons as dependency...
r2351 # make OLD entries from <4.10.0 work
home: removed old pylons routes and convert them to pyramid ops app
r2099 config.add_route(
name='ops_ping_legacy', pattern=ADMIN_PREFIX + '/ping')
config.add_route(
name='ops_error_test_legacy', pattern=ADMIN_PREFIX + '/error_test')
core: added ops view to pyramid to have a PING command with pure pyramid.
r1669
# Scan module for configuration decorators.
pyramid: use a faster scan method for faster app start.
r1991 config.scan('.views', ignore='.tests')