diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 18:27:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 18:27:09 +0000 |
commit | bcc70301531b6c3118120173389f2aaa7452bf11 (patch) | |
tree | 161f1ee56e15ec9e59f48c5e1a9cb86b62469a49 /app | |
parent | d47fc5085a706ab37d038636c9d5934da69853f0 (diff) | |
download | gitlab-ce-bcc70301531b6c3118120173389f2aaa7452bf11.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/images/bot_avatars/alert-bot.png | bin | 9362 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/bot_avatars/security-bot.png | bin | 9561 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/bot_avatars/support-bot.png | bin | 9806 -> 0 bytes | |||
-rw-r--r-- | app/assets/javascripts/design_management_new/pages/index.vue | 24 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/actions.js | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/components/design_management/design_list_item.scss | 9 | ||||
-rw-r--r-- | app/controllers/clusters/base_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/approvable_base.rb | 4 | ||||
-rw-r--r-- | app/models/concerns/avatarable.rb | 2 | ||||
-rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/_design_management.html.haml | 20 | ||||
-rw-r--r-- | app/views/projects/pipelines/_with_tabs.html.haml | 2 |
13 files changed, 42 insertions, 31 deletions
diff --git a/app/assets/images/bot_avatars/alert-bot.png b/app/assets/images/bot_avatars/alert-bot.png Binary files differdeleted file mode 100644 index 985d67d6179..00000000000 --- a/app/assets/images/bot_avatars/alert-bot.png +++ /dev/null diff --git a/app/assets/images/bot_avatars/security-bot.png b/app/assets/images/bot_avatars/security-bot.png Binary files differdeleted file mode 100644 index 0709f62f07b..00000000000 --- a/app/assets/images/bot_avatars/security-bot.png +++ /dev/null diff --git a/app/assets/images/bot_avatars/support-bot.png b/app/assets/images/bot_avatars/support-bot.png Binary files differdeleted file mode 100644 index 1335205c191..00000000000 --- a/app/assets/images/bot_avatars/support-bot.png +++ /dev/null diff --git a/app/assets/javascripts/design_management_new/pages/index.vue b/app/assets/javascripts/design_management_new/pages/index.vue index 2a100fae280..700fa903a9c 100644 --- a/app/assets/javascripts/design_management_new/pages/index.vue +++ b/app/assets/javascripts/design_management_new/pages/index.vue @@ -246,28 +246,28 @@ export default { this.onUploadDesign([newFile]); } }, - toggleOnPasteListener(route) { - if (route === DESIGNS_ROUTE_NAME) { - document.addEventListener('paste', this.onDesignPaste); - } else { - document.removeEventListener('paste', this.onDesignPaste); - } + toggleOnPasteListener() { + document.addEventListener('paste', this.onDesignPaste); + }, + toggleOffPasteListener() { + document.removeEventListener('paste', this.onDesignPaste); }, }, beforeRouteUpdate(to, from, next) { - this.toggleOnPasteListener(to.name); this.selectedDesigns = []; next(); }, - beforeRouteLeave(to, from, next) { - this.toggleOnPasteListener(to.name); - next(); - }, }; </script> <template> - <div data-testid="designs-root" class="gl-mt-5"> + <div + data-testid="designs-root" + class="gl-mt-5" + :class="{ 'designs-root': !isDesignListEmpty }" + @mouseenter="toggleOnPasteListener" + @mouseleave="toggleOffPasteListener" + > <header v-if="showToolbar" class="row-content-block border-top-0 p-2 d-flex"> <div class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-w-full"> <div> diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index d469ed8ee82..fcc4a8160f4 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -748,9 +748,11 @@ export const setCurrentDiffFileIdFromNote = ({ commit, rootGetters }, noteId) => if (!note) return; - const fileHash = rootGetters.getDiscussion(note.discussion_id).diff_file.file_hash; + const fileHash = rootGetters.getDiscussion(note.discussion_id).diff_file?.file_hash; - commit(types.UPDATE_CURRENT_DIFF_FILE_ID, fileHash); + if (fileHash) { + commit(types.UPDATE_CURRENT_DIFF_FILE_ID, fileHash); + } }; export const navigateToDiffFileIndex = ({ commit, state }, index) => { diff --git a/app/assets/stylesheets/components/design_management/design_list_item.scss b/app/assets/stylesheets/components/design_management/design_list_item.scss index b7f6b2026fe..3a6781b666e 100644 --- a/app/assets/stylesheets/components/design_management/design_list_item.scss +++ b/app/assets/stylesheets/components/design_management/design_list_item.scss @@ -1,3 +1,12 @@ +.designs-root { + border: 2px dashed transparent; + transition: border $gl-transition-duration-medium $general-hover-transition-curve; + + &:hover { + border-color: $gray-100; + } +} + .design-list-item { height: 280px; text-decoration: none; diff --git a/app/controllers/clusters/base_controller.rb b/app/controllers/clusters/base_controller.rb index 6b83400971d..c79a0bb01bc 100644 --- a/app/controllers/clusters/base_controller.rb +++ b/app/controllers/clusters/base_controller.rb @@ -7,7 +7,7 @@ class Clusters::BaseController < ApplicationController before_action :authorize_read_cluster! before_action do - push_frontend_feature_flag(:managed_apps_local_tiller, clusterable) + push_frontend_feature_flag(:managed_apps_local_tiller, clusterable, default_enabled: true) end helper_method :clusterable diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index e65e5531b88..5d4514be838 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -84,7 +84,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar') @current_user_data = UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json @show_whitespace_default = current_user.nil? || current_user.show_whitespace_in_diffs - @file_by_file_default = Feature.enabled?(:view_diffs_file_by_file) && current_user&.view_diffs_file_by_file + @file_by_file_default = Feature.enabled?(:view_diffs_file_by_file, default_enabled: true) && current_user&.view_diffs_file_by_file @coverage_path = coverage_reports_project_merge_request_path(@project, @merge_request, format: :json) if @merge_request.has_coverage_reports? @endpoint_metadata_url = endpoint_metadata_url(@project, @merge_request) diff --git a/app/models/concerns/approvable_base.rb b/app/models/concerns/approvable_base.rb index 6323bd01c58..d07c4ec43ac 100644 --- a/app/models/concerns/approvable_base.rb +++ b/app/models/concerns/approvable_base.rb @@ -13,4 +13,8 @@ module ApprovableBase approved_by_users.include?(user) end + + def can_be_approved_by?(user) + user && !approved_by?(user) && user.can?(:approve_merge_request, self) + end end diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb index ac84ef94b1c..60de20c3b31 100644 --- a/app/models/concerns/avatarable.rb +++ b/app/models/concerns/avatarable.rb @@ -38,7 +38,7 @@ module Avatarable class_methods do def bot_avatar(image:) - Rails.root.join('app', 'assets', 'images', 'bot_avatars', image).open + Rails.root.join('lib', 'assets', 'images', 'bot_avatars', image).open end end diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 659b3066603..bc1f2cb3072 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -70,7 +70,7 @@ = f.check_box :show_whitespace_in_diffs, class: 'form-check-input' = f.label :show_whitespace_in_diffs, class: 'form-check-label' do = s_('Preferences|Show whitespace changes in diffs') - - if Feature.enabled?(:view_diffs_file_by_file) + - if Feature.enabled?(:view_diffs_file_by_file, default_enabled: true) .form-group.form-check = f.check_box :view_diffs_file_by_file, class: 'form-check-input' = f.label :view_diffs_file_by_file, class: 'form-check-label' do diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml index 045f032e6e7..9d88d77eac9 100644 --- a/app/views/projects/issues/_design_management.html.haml +++ b/app/views/projects/issues/_design_management.html.haml @@ -1,3 +1,8 @@ +- requirements_link_url = help_page_path('user/project/issues/design_management', anchor: 'requirements') +- requirements_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: requirements_link_url } +- link_end = '</a>'.html_safe +- enable_lfs_message = s_("DesignManagement|To upload designs, you'll need to enable LFS. %{requirements_link_start}More information%{requirements_link_end}").html_safe % { requirements_link_start: requirements_link_start, requirements_link_end: link_end } + - if @project.design_management_enabled? - if Feature.enabled?(:design_management_moved, @project, default_enabled: true) .js-design-management-new{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } } @@ -5,13 +10,8 @@ .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } } - else - if Feature.enabled?(:design_management_moved, @project, default_enabled: true) - .row.empty-state.design-dropzone-border.gl-mt-5 - .text-content.center.gl-font-weight-bold - - requirements_link_url = help_page_path('user/project/issues/design_management', anchor: 'requirements') - - requirements_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: requirements_link_url } - - support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: support_url } - - link_end = '</a>'.html_safe - = s_("DesignManagement|To enable design management, you'll need to %{requirements_link_start}meet the requirements%{requirements_link_end}. If you need help, reach out to our %{support_link_start}support team%{support_link_end} for assistance.").html_safe % { requirements_link_start: requirements_link_start, requirements_link_end: link_end, support_link_start: support_link_start, support_link_end: link_end } + .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center + = enable_lfs_message - else .mt-4 .row.empty-state @@ -20,8 +20,4 @@ %h4.center = _('The one place for your designs') %p.center - - requirements_link_url = help_page_path('user/project/issues/design_management', anchor: 'requirements') - - requirements_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: requirements_link_url } - - support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: support_url } - - link_end = '</a>'.html_safe - = s_("DesignManagement|To enable design management, you'll need to %{requirements_link_start}meet the requirements%{requirements_link_end}. If you need help, reach out to our %{support_link_start}support team%{support_link_end} for assistance.").html_safe % { requirements_link_start: requirements_link_start, requirements_link_end: link_end, support_link_start: support_link_start, support_link_end: link_end } + = enable_lfs_message diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml index 590ae72a2ff..be947b42e25 100644 --- a/app/views/projects/pipelines/_with_tabs.html.haml +++ b/app/views/projects/pipelines/_with_tabs.html.haml @@ -1,5 +1,5 @@ - test_reports_enabled = Feature.enabled?(:junit_pipeline_view, @project) -- dag_pipeline_tab_enabled = Feature.enabled?(:dag_pipeline_tab, @project, default_enabled: false) +- dag_pipeline_tab_enabled = Feature.enabled?(:dag_pipeline_tab, @project, default_enabled: true) .tabs-holder %ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator.nav.nav-tabs |