diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 11:49:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 11:49:00 +0000 |
commit | c223f8a153f7ee65458e89a0be36200f97a0c5a3 (patch) | |
tree | 73986f9e462730c4b46ff07ef0be4362e49d5bb6 /app | |
parent | 7099ecf77cb45c7b456a47f24064657ca59549b7 (diff) | |
download | gitlab-ce-c223f8a153f7ee65458e89a0be36200f97a0c5a3.tar.gz |
Add latest changes from gitlab-org/gitlab@12-3-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/jobs/components/log/duration_badge.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/components/log/line.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/components/log/line_header.vue | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/job_log.scss | 4 | ||||
-rw-r--r-- | app/helpers/boards_helper.rb | 2 | ||||
-rw-r--r-- | app/services/boards/lists/update_service.rb | 10 | ||||
-rw-r--r-- | app/views/clusters/clusters/show.html.haml | 9 | ||||
-rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 2 |
8 files changed, 17 insertions, 18 deletions
diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue index 83f62703d27..31a101d2c95 100644 --- a/app/assets/javascripts/jobs/components/log/duration_badge.vue +++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue @@ -9,5 +9,7 @@ export default { }; </script> <template> - <div class="duration rounded align-self-start px-2 ml-2 flex-shrink-0">{{ duration }}</div> + <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0"> + {{ duration }} + </div> </template> diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue index 336ae623f0f..4e09c85b25a 100644 --- a/app/assets/javascripts/jobs/components/log/line.vue +++ b/app/assets/javascripts/jobs/components/log/line.vue @@ -19,7 +19,7 @@ export default { </script> <template> - <div class="line"> + <div class="log-line"> <line-number :line-number="line.lineNumber" :path="path" /> <span v-for="(content, i) in line.content" :key="i" :class="content.style">{{ content.text diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue index af8de9ec0fa..92cf3b3cf5f 100644 --- a/app/assets/javascripts/jobs/components/log/line_header.vue +++ b/app/assets/javascripts/jobs/components/log/line_header.vue @@ -43,7 +43,7 @@ export default { <template> <div - class="line collapsible-line d-flex justify-content-between" + class="log-line collapsible-line d-flex justify-content-between" role="button" @click="handleOnClick" > diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss index 5c2491c8233..074b2405217 100644 --- a/app/assets/stylesheets/framework/job_log.scss +++ b/app/assets/stylesheets/framework/job_log.scss @@ -11,7 +11,7 @@ background-color: $builds-trace-bg; } -.line { +.log-line { padding: 1px $gl-padding 1px $job-log-line-padding; } @@ -40,7 +40,7 @@ } } -.duration { +.log-duration-badge { background: $gl-gray-400; } diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 3f0679f9bf9..d3950219f3f 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -88,7 +88,7 @@ module BoardsHelper end def boards_link_text - if multiple_boards_available? + if current_board_parent.multiple_issue_boards_available? s_("IssueBoards|Boards") else s_("IssueBoards|Board") diff --git a/app/services/boards/lists/update_service.rb b/app/services/boards/lists/update_service.rb index 2ddeb6f0bd8..ad96e42f756 100644 --- a/app/services/boards/lists/update_service.rb +++ b/app/services/boards/lists/update_service.rb @@ -4,10 +4,10 @@ module Boards module Lists class UpdateService < Boards::BaseService def execute(list) - return not_authorized if preferences? && !can_read?(list) - return not_authorized if position? && !can_admin?(list) + update_preferences_result = update_preferences(list) if can_read?(list) + update_position_result = update_position(list) if can_admin?(list) - if update_preferences(list) || update_position(list) + if update_preferences_result || update_position_result success(list: list) else error(list.errors.messages, 422) @@ -32,10 +32,6 @@ module Boards { collapsed: Gitlab::Utils.to_boolean(params[:collapsed]) } end - def not_authorized - error("Not authorized", 403) - end - def preferences? params.has_key?(:collapsed) end diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 00fdd5e9562..cccba48624b 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -3,6 +3,7 @@ - breadcrumb_title @cluster.name - page_title _('Kubernetes Cluster') - manage_prometheus_path = edit_project_service_path(@cluster.project, 'prometheus') if @project +- cluster_environments_path = clusterable.environments_cluster_path(@cluster) - expanded = expanded_by_default? @@ -16,7 +17,7 @@ install_jupyter_path: clusterable.install_applications_cluster_path(@cluster, :jupyter), install_knative_path: clusterable.install_applications_cluster_path(@cluster, :knative), update_knative_path: clusterable.update_applications_cluster_path(@cluster, :knative), - cluster_environments_path: clusterable.environments_cluster_path(@cluster), + cluster_environments_path: cluster_environments_path, toggle_status: @cluster.enabled? ? 'true': 'false', has_rbac: has_rbac_enabled?(@cluster) ? 'true': 'false', cluster_type: @cluster.cluster_type, @@ -37,7 +38,7 @@ %h4= @cluster.name = render 'banner' - = render_if_exists 'clusters/clusters/group_cluster_environments', expanded: expanded - - - unless Gitlab.ee? + - if cluster_environments_path.present? + = render_if_exists 'clusters/clusters/group_cluster_environments', expanded: expanded + - else = render 'configure', expanded: expanded diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index de994250649..c9458475aa5 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -6,7 +6,7 @@ .issues-filters{ class: ("w-100" if type == :boards_modal) } .issues-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row{ class: block_css_class, "v-pre" => type == :boards_modal } - - if type == :boards && (multiple_boards_available? || current_board_parent.boards.size > 1) + - if type == :boards = render "shared/boards/switcher", board: board = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form w-100' do - if params[:search].present? |