diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
| commit | 39fa7d1eeb2dba52f0601128f3ac91f57d19866e (patch) | |
| tree | da042d34ff762dd1957e51666a34202295a081b9 /app/views | |
| parent | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (diff) | |
| download | gitlab-ce-39fa7d1eeb2dba52f0601128f3ac91f57d19866e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/kaminari/gitlab/_gap.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/show.js.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/kaminari/gitlab/_gap.html.haml b/app/views/kaminari/gitlab/_gap.html.haml index 849f92fdc95..c47a8891fd5 100644 --- a/app/views/kaminari/gitlab/_gap.html.haml +++ b/app/views/kaminari/gitlab/_gap.html.haml @@ -5,4 +5,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %li.page-item.disabled.d-none.d-md-block - = link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' + = link_to raw(t('views.pagination.truncate')), '#', class: 'page-link' diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 1a1da6b3801..e20573ed3a7 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -129,7 +129,7 @@ = render_if_exists 'shared/issuable/sidebar_weight', issuable_sidebar: issuable_sidebar - - if Feature.enabled?(:save_issuable_health_status, @project.group) && issuable_sidebar[:type] == "issue" + - if issuable_sidebar.dig(:features_available, :health_status) .js-sidebar-status-entry-point - if issuable_sidebar.has_key?(:confidential) diff --git a/app/views/shared/snippets/show.js.haml b/app/views/shared/snippets/show.js.haml index a9af732bbb5..d552c1a723b 100644 --- a/app/views/shared/snippets/show.js.haml +++ b/app/views/shared/snippets/show.js.haml @@ -1,2 +1,2 @@ -document.write('#{escape_javascript(stylesheet_link_tag "#{stylesheet_url 'snippets'}")}'); -document.write('#{escape_javascript(render 'shared/snippets/embed')}'); +document.write('#{escape_javascript(stylesheet_link_tag("#{stylesheet_url 'snippets'}"))}'); +document.write('#{escape_javascript(render('shared/snippets/embed'))}'); |