diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 00:06:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 00:06:41 +0300 |
commit | da35510cdad8f8d3cb6c119682dc2735531983cd (patch) | |
tree | d42432c9ddc0d55a3c6316cdb539af11244a148f /app/views | |
parent | 7f82744e89f22bdd2d13f85ca4dc66e088f3da5c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/application_settings/_visibility_and_access.html.haml | 5 | ||||
-rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index e57ef1ea18f..be5f1f4f9a8 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -53,6 +53,11 @@ = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control') %span.form-text.text-muted#clone-protocol-help = _('Allow only the selected protocols to be used for Git access.') + .form-group + = f.label :custom_http_clone_url_root, _('Custom Git clone URL for HTTP(S)'), class: 'label-bold' + = f.text_field :custom_http_clone_url_root, class: 'form-control', placeholder: 'https://git.example.com', :'aria-describedby' => 'custom_http_clone_url_root_help_block' + %span.form-text.text-muted#custom_http_clone_url_root_help_block + = _('Replaces the clone URL root.') - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| - field_name = :"#{type}_key_restriction" diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 094cbf755e1..4eec81c9125 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -59,3 +59,9 @@ %span.js-details-content.hide = link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full" = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) + + .well-segment.related-merge-request-info + .icon-container + = sprite_icon("git-merge") + %span.related-merge-requests + = @pipeline.all_related_merge_request_text |