rhodecode-enterprise-ce Files · setup.cfg

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.

marcink - - Load All Authors

File last commit:

r1098:5d0049e7 default


                r2784:e8c62649

default

Download file

             setup.cfg
        
                    43 lines
            
             | 789 B
            
                | text/x-ini
            
             |
                IniLexer
            
             / setup.cfg
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [aliases]

      test = pytest

      [egg_info]

      tag_build =

      tag_svn_revision = false

      # Babel configuration

      [compile_catalog]

      domain = rhodecode

      directory = rhodecode/i18n

      statistics = true

      [extract_messages]

      add_comments = TRANSLATORS:

      output_file = rhodecode/i18n/rhodecode.pot

      msgid-bugs-address = marcin@rhodecode.com

      copyright-holder = RhodeCode GmbH

      no-wrap = true

      keywords =

          lazy_ugettext

          _ngettext

          _gettext

          gettext_translator

      [init_catalog]

      domain = rhodecode

      input_file = rhodecode/i18n/rhodecode.pot

      output_dir = rhodecode/i18n

      [update_catalog]

      domain = rhodecode

      input_file = rhodecode/i18n/rhodecode.pot

      output_dir = rhodecode/i18n

      previous = true

      [build_sphinx]

      source-dir = docs/

      build-dir  = docs/_build

      all_files  = 1

      [upload_sphinx]

      upload-dir = docs/_build/html

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				[aliases]
				test = pytest

				[egg_info]
				tag_build =
				tag_svn_revision = false

				# Babel configuration
				[compile_catalog]
				domain = rhodecode
				directory = rhodecode/i18n
				statistics = true

				[extract_messages]
				add_comments = TRANSLATORS:
				output_file = rhodecode/i18n/rhodecode.pot
				msgid-bugs-address = marcin@rhodecode.com
				copyright-holder = RhodeCode GmbH
				no-wrap = true
				keywords =
				lazy_ugettext
				_ngettext
				_gettext
				gettext_translator

				[init_catalog]
				domain = rhodecode
				input_file = rhodecode/i18n/rhodecode.pot
				output_dir = rhodecode/i18n

				[update_catalog]
				domain = rhodecode
				input_file = rhodecode/i18n/rhodecode.pot
				output_dir = rhodecode/i18n
				previous = true

				[build_sphinx]
				source-dir = docs/
				build-dir = docs/_build
				all_files = 1

				[upload_sphinx]
				upload-dir = docs/_build/html