u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/admin/repos/repo_edit_remote.html

vcs: Return merge reference in merge response....

vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1051:668a5e47

default

Download file

             repo_edit_remote.html
        
                    29 lines
            
             | 1.1 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / admin / repos / repo_edit_remote.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <div class="panel panel-default">

          <div class="panel-heading">

              <h3 class="panel-title">${_('Remote url')}</h3>

          </div>

          <div class="panel-body">

              %if c.repo_info.clone_uri:

                  <div class="panel-body-title-text">${_('Remote mirror url')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></div>

                  ${h.secure_form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}

                  <div class="form">

                     <div class="fields">

                         ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}

                     </div>

                  </div>

                  ${h.end_form()}

              %else:

                <div class="panel-body-title-text">${_('This repository does not have any remote mirror url set.')}</div>

                <button class="btn btn-default" type="submit" disabled="disabled">

                  ${_('Pull changes from remote location')}

                </button>

              %endif

          </div>

      </div>

	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

				<div class="panel panel-default">
				<div class="panel-heading">
				<h3 class="panel-title">${_('Remote url')}</h3>
				</div>
				<div class="panel-body">

				%if c.repo_info.clone_uri:

				<div class="panel-body-title-text">${_('Remote mirror url')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></div>

				${h.secure_form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}
				<div class="form">
				<div class="fields">
				${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}
				</div>
				</div>
				${h.end_form()}
				%else:
				<div class="panel-body-title-text">${_('This repository does not have any remote mirror url set.')}</div>

				<button class="btn btn-default" type="submit" disabled="disabled">
				${_('Pull changes from remote location')}
				</button>
				%endif
				</div>
				</div>