rhodecode-enterprise-ce Files · docs/collaboration/merge-pull-request.rst

auth: don't break hashing in case of user with empty password....

auth: don't break hashing in case of user with empty password. In some cases such as LDAP user created via external scripts users might set the passwords to empty. The hashing uses the md5(password_hash) to store reference to detect password changes and forbid using the same password. In case of pure LDAP users this is not valid, and we shouldn't raise Errors in such case. This change makes it work for empty passwords now.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r2203:8a18c3c3

default

Download file

             merge-pull-request.rst
        
                    35 lines
            
             | 1.2 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / docs / collaboration / merge-pull-request.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      .. _merge-requests-ref:

      Merge a |pr|

      ------------

      |RCM| can detect if it can automatically merge the changes in a |pr|. If it

      can, you will see the following message:

      :guilabel:`This pull request can be automatically merged.` To merge,

      click the big blue button! To enable this feature, see :ref:`server-side-merge`.

      .. image:: ../images/merge-pr-button.png

      If you cannot automatically merge a |pr|, you will see one of the following

      messages:

      * :guilabel:`This pull request cannot be merged because of conflicts`

      * :guilabel:`Reviewer approval is pending`

      .. _manual-merge-requests-ref:

      Manual Merge a |PR|

      ^^^^^^^^^^^^^^^^^^^

      If |RCM| cannot safely merge the changes in a |pr|,

      usually due to conflicts, you need to manually merge the changes on the

      command line. You can see more information for each |repo| type at the

      following links:

      * `Git Manual Merging`_

      * `Mercurial Manual Merging`_

      * `Subversion Manual Merging`_

      .. _Git Manual Merging: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

      .. _Mercurial Manual Merging: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html

      .. _Subversion Manual Merging: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.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

marcink project: added all source files and assets	r1	.. _merge-requests-ref:

		Merge a \|pr\|
		------------

		\|RCM\| can detect if it can automatically merge the changes in a \|pr\|. If it
		can, you will see the following message:
		:guilabel:`This pull request can be automatically merged.` To merge,
		click the big blue button! To enable this feature, see :ref:`server-side-merge`.

		.. image:: ../images/merge-pr-button.png

		If you cannot automatically merge a \|pr\|, you will see one of the following
		messages:

		* :guilabel:`This pull request cannot be merged because of conflicts`
		* :guilabel:`Reviewer approval is pending`

		.. _manual-merge-requests-ref:

		Manual Merge a \|PR\|
		^^^^^^^^^^^^^^^^^^^

		If \|RCM\| cannot safely merge the changes in a \|pr\|,
		usually due to conflicts, you need to manually merge the changes on the
		command line. You can see more information for each \|repo\| type at the
		following links:

		* `Git Manual Merging`_
		* `Mercurial Manual Merging`_
		* `Subversion Manual Merging`_

		.. _Git Manual Merging: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
		.. _Mercurial Manual Merging: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
		.. _Subversion Manual Merging: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html