diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-04-09 14:20:37 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-09 14:20:37 +0000 |
| commit | 4bce8b8eb73c7c8e599feba1c1157ac90ec64bf2 (patch) | |
| tree | 2d394044bd56d23d48bd9129afdb20d8a1c9cc7c | |
| parent | 58d4099c1469dba9ff850733ba29da11f6eeb158 (diff) | |
| parent | d3de5fcfa8331e13bcf00d41653c2c6ee337abf5 (diff) | |
| download | gitlab-ce-4bce8b8eb73c7c8e599feba1c1157ac90ec64bf2.tar.gz | |
Merge branch 'always-link-instance-configuration' into 'master'
Always show instance configuration link
Closes #59730
See merge request gitlab-org/gitlab-ce!26783
| -rw-r--r-- | app/views/help/index.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/always-link-instance-configuration.yml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index f40fdb0b86b..916f98a62d1 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -24,8 +24,9 @@ Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises. %br Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}. - %p= link_to 'Check the current instance configuration ', help_instance_configuration_url - %hr + +%p= link_to 'Check the current instance configuration ', help_instance_configuration_url +%hr .row.prepend-top-default .col-md-8 diff --git a/changelogs/unreleased/always-link-instance-configuration.yml b/changelogs/unreleased/always-link-instance-configuration.yml new file mode 100644 index 00000000000..3f08747edf7 --- /dev/null +++ b/changelogs/unreleased/always-link-instance-configuration.yml @@ -0,0 +1,5 @@ +--- +title: Always show instance configuration link +merge_request: 26783 +author: Bastian Blank +type: fixed |