diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 21:06:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 21:06:17 +0300 |
| commit | 3fdbfaf3e587a0e25b6351e72d19e3bc1b47b33e (patch) | |
| tree | 02fe9c114e452965525422920a3addaa8eafe2bc /app | |
| parent | b1d7b01241da7f7f5d42c5ef46c7788fac0ab6d3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index ed4bd5ae19e..ed9b3ab1940 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -30,7 +30,7 @@ value: key, placeholder: s_('CiVariables|Input variable key') } .ci-variable-body-item.gl-show-field-errors.table-section.section-15.border-top-0.p-0 - .form-control.js-secret-value-placeholder.qa-ci-variable-input-value{ class: ('hide' unless id) } + .form-control.js-secret-value-placeholder.qa-ci-variable-input-value.overflow-hidden{ class: ('hide' unless id) } = '*' * 17 %textarea.js-ci-variable-input-value.js-secret-value.qa-ci-variable-input-value.form-control{ class: ('hide' if id), rows: 1, diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 7b0824ae2af..4b83239dfbd 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -59,7 +59,7 @@ = render_if_exists 'layouts/nav/sidebar/analytics_more_link' %li.dropdown.d-lg-none - = render_if_exists 'dashboard/operations/nav_link_list' + = render_if_exists 'dashboard/nav_link_list' - if can?(current_user, :read_instance_statistics) = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: 'd-lg-none' }) do = link_to instance_statistics_root_path do @@ -86,7 +86,7 @@ = _('Web IDE') %li.dropdown{ class: 'd-none d-lg-block' } - = render_if_exists 'dashboard/operations/nav_link' + = render_if_exists 'dashboard/nav_link' - if can?(current_user, :read_instance_statistics) = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: "d-none d-lg-block d-xl-block"}) do = link_to instance_statistics_root_path, title: _('Instance Statistics'), aria: { label: _('Instance Statistics') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do |