From 6d60f910762c1a92a07a4afaf1b26962f75ee4b6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Oct 2019 21:06:22 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../boards/components/issue_time_estimate.vue | 2 +- .../components/stage_card_list_item.vue | 2 +- .../components/error_tracking_list.vue | 2 +- .../groups/components/item_actions.vue | 4 +- .../commit_sidebar/list_collapsed.vue | 4 +- .../components/commit_sidebar/list_item.vue | 2 +- .../ide/components/external_link.vue | 2 +- .../ide/components/file_row_extra.vue | 2 +- .../javascripts/ide/components/jobs/stage.vue | 2 +- .../ide/components/mr_file_icon.vue | 2 +- .../ide/components/new_dropdown/button.vue | 2 +- .../ide/components/repo_file_status_icon.vue | 2 +- .../notes/components/note_actions.vue | 10 ++-- .../components/note_actions/reply_button.vue | 2 +- .../set_status_modal_wrapper.vue | 6 +-- .../sidebar/components/todo_toggle/todo.vue | 6 +-- .../components/review_app_link.vue | 2 +- .../components/changed_file_icon.vue | 2 +- .../vue_shared/components/ci_icon.vue | 2 +- .../viewers/download_viewer.vue | 2 +- .../vue_shared/components/file_icon.vue | 2 +- .../vue_shared/components/icon.vue | 52 ++----------------- .../issue/related_issuable_item.vue | 4 +- .../vue_shared/components/toggle_button.vue | 2 +- .../components/user_popover/user_popover.vue | 10 ++-- config/initializers/0_inflections.rb | 1 + config/initializers/7_prometheus_metrics.rb | 2 + doc/development/fe_guide/icons.md | 4 +- .../metrics/requests_rack_middleware.rb | 20 +++++++ .../features/api/1_manage/rate_limits_spec.rb | 7 +-- .../project_archive_compare_spec.rb | 2 +- ...iscussion_jump_to_next_button_spec.js.snap | 1 - .../confidential_issue_sidebar_spec.js.snap | 8 --- .../sidebar/__snapshots__/todo_spec.js.snap | 2 +- spec/frontend/sidebar/todo_spec.js | 7 ++- .../components/changed_file_icon_spec.js | 5 +- .../vue_shared/components/file_icon_spec.js | 2 +- .../vue_shared/components/icon_spec.js | 8 --- .../metrics/requests_rack_middleware_spec.rb | 14 +++++ 39 files changed, 89 insertions(+), 124 deletions(-) diff --git a/app/assets/javascripts/boards/components/issue_time_estimate.vue b/app/assets/javascripts/boards/components/issue_time_estimate.vue index 3385aad5b11..5c33ba9461c 100644 --- a/app/assets/javascripts/boards/components/issue_time_estimate.vue +++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue @@ -34,7 +34,7 @@ export default { diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue index 3156a398113..b6fc567f8cc 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue @@ -86,7 +86,7 @@ export default { data-placement="left" class="append-bottom-10" > - + {{ addedFilesLength }}
- +
{{ modifiedFilesLength }} diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index 302adccd759..47b205f0a75 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -114,7 +114,7 @@ export default {
- +
diff --git a/app/assets/javascripts/ide/components/external_link.vue b/app/assets/javascripts/ide/components/external_link.vue index d1857f0176a..558da9b706e 100644 --- a/app/assets/javascripts/ide/components/external_link.vue +++ b/app/assets/javascripts/ide/components/external_link.vue @@ -28,7 +28,7 @@ export default { rel="noopener noreferrer" > {{ __('Open in file view') }} - + diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index 48be97c8952..5819999a459 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -79,7 +79,7 @@ export default { data-container="body" data-placement="right" name="file-modified" - css-classes="prepend-left-5 ide-file-modified" + class="prepend-left-5 ide-file-modified" /> {{ jobsCount }} - +
diff --git a/app/assets/javascripts/ide/components/mr_file_icon.vue b/app/assets/javascripts/ide/components/mr_file_icon.vue index 821be319cce..cf8a1abbde4 100644 --- a/app/assets/javascripts/ide/components/mr_file_icon.vue +++ b/app/assets/javascripts/ide/components/mr_file_icon.vue @@ -18,6 +18,6 @@ export default { :title="__('Part of merge request changes')" :size="12" name="git-merge" - css-classes="append-right-8" + class="append-right-8" /> diff --git a/app/assets/javascripts/ide/components/new_dropdown/button.vue b/app/assets/javascripts/ide/components/new_dropdown/button.vue index 062a64a19d7..5bd6642930c 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/button.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/button.vue @@ -52,7 +52,7 @@ export default { class="btn-blank" @click.stop.prevent="clicked" > - + diff --git a/app/assets/javascripts/ide/components/repo_file_status_icon.vue b/app/assets/javascripts/ide/components/repo_file_status_icon.vue index 84a962bfc7d..9773e835a5c 100644 --- a/app/assets/javascripts/ide/components/repo_file_status_icon.vue +++ b/app/assets/javascripts/ide/components/repo_file_status_icon.vue @@ -29,6 +29,6 @@ export default { diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 6cc873359da..89d434a60ba 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -149,9 +149,9 @@ export default { title="Add reaction" data-position="right" > - - - + + +
- +
@@ -191,7 +191,7 @@ export default { data-toggle="dropdown" @click="closeTooltip" > - +
  • diff --git a/app/assets/javascripts/notes/components/note_actions/reply_button.vue b/app/assets/javascripts/notes/components/note_actions/reply_button.vue index 8bdee759a23..20551279aec 100644 --- a/app/assets/javascripts/notes/components/note_actions/reply_button.vue +++ b/app/assets/javascripts/notes/components/note_actions/reply_button.vue @@ -26,7 +26,7 @@ export default { :title="__('Reply to comment')" @click="$emit('startReplying')" > - +
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index 35eba266625..396ecc3e291 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -194,9 +194,9 @@ export default { v-show="noEmoji" class="js-no-emoji-placeholder no-emoji-placeholder position-relative" > - - - + + + diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue index e6f2fe2b5fc..3d96405896d 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue @@ -82,11 +82,7 @@ export default { data-boundary="viewport" @click="handleButtonClick" > - + {{ buttonLabel }} diff --git a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue index 457a71cab95..75f557d05dd 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue @@ -19,6 +19,6 @@ export default { diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue index a97538d813a..54cd0c9c642 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -83,7 +83,7 @@ export default { :class="{ 'ml-auto': isCentered }" class="file-changed-icon d-inline-block" > - + diff --git a/app/assets/javascripts/vue_shared/components/ci_icon.vue b/app/assets/javascripts/vue_shared/components/ci_icon.vue index 5d373e179b2..162cfc02959 100644 --- a/app/assets/javascripts/vue_shared/components/ci_icon.vue +++ b/app/assets/javascripts/vue_shared/components/ci_icon.vue @@ -66,5 +66,5 @@ export default { }; diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue index c6d61d6ee62..fe1a2a092ad 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue @@ -40,7 +40,7 @@ export default {

- + {{ __('Download') }} diff --git a/app/assets/javascripts/vue_shared/components/file_icon.vue b/app/assets/javascripts/vue_shared/components/file_icon.vue index b69ecc1dce6..952ffa1fa0e 100644 --- a/app/assets/javascripts/vue_shared/components/file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/file_icon.vue @@ -75,7 +75,7 @@ export default { - + diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue index fa89473da62..73f4dfef062 100644 --- a/app/assets/javascripts/vue_shared/components/icon.vue +++ b/app/assets/javascripts/vue_shared/components/icon.vue @@ -27,7 +27,7 @@ if (process.env.NODE_ENV !== 'production') { * */ export default { @@ -42,45 +42,7 @@ export default { type: Number, required: false, default: 16, - validator(value) { - return validSizes.includes(value); - }, - }, - - cssClasses: { - type: String, - required: false, - default: '', - }, - - width: { - type: Number, - required: false, - default: null, - }, - - height: { - type: Number, - required: false, - default: null, - }, - - y: { - type: Number, - required: false, - default: null, - }, - - x: { - type: Number, - required: false, - default: null, - }, - - tabIndex: { - type: String, - required: false, - default: null, + validator: value => validSizes.includes(value), }, }, @@ -99,15 +61,7 @@ export default { diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue index 61239a564a8..5d7e9557aff 100644 --- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue @@ -63,7 +63,7 @@ export default { - + diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index a60d5eb491e..7c7d46ee759 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -71,15 +71,11 @@ export default {
- + {{ user.bio }}
- + {{ user.organization }}
{{ user.location }} ``` diff --git a/lib/gitlab/metrics/requests_rack_middleware.rb b/lib/gitlab/metrics/requests_rack_middleware.rb index 26aa0910047..46477587934 100644 --- a/lib/gitlab/metrics/requests_rack_middleware.rb +++ b/lib/gitlab/metrics/requests_rack_middleware.rb @@ -3,6 +3,18 @@ module Gitlab module Metrics class RequestsRackMiddleware + HTTP_METHODS = { + "delete" => %w(200 202 204 303 400 401 403 404 410 422 500 503), + "get" => %w(200 204 301 302 303 304 307 400 401 403 404 410 412 422 429 500 503), + "head" => %w(200 204 301 302 303 304 400 401 403 404 410 429 500 503), + "options" => %w(200 404), + "patch" => %w(200 202 204 400 403 404 409 416 422 500), + "post" => %w(200 201 202 204 301 302 303 304 400 401 403 404 406 409 410 412 413 415 422 429 500 503), + "propfind" => %w(404), + "put" => %w(200 202 204 400 401 403 404 405 406 409 410 415 422 500), + "report" => %w(404) + }.freeze + def initialize(app) @app = app end @@ -20,6 +32,14 @@ module Gitlab {}, [0.05, 0.1, 0.25, 0.5, 0.7, 1, 2.5, 5, 10, 25]) end + def self.initialize_http_request_duration_seconds + HTTP_METHODS.each do |method, statuses| + statuses.each do |status| + http_request_duration_seconds.get({ method: method, status: status }) + end + end + end + def call(env) method = env['REQUEST_METHOD'].downcase started = Time.now.to_f diff --git a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb index 44c5e0b4196..819739ac535 100644 --- a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb +++ b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb @@ -3,11 +3,8 @@ module QA context 'Manage with IP rate limits', :requires_admin do describe 'Users API' do - before(:context) do - @api_client = Runtime::API::Client.new(:gitlab, ip_limits: true) - end - - let(:request) { Runtime::API::Request.new(@api_client, '/users') } + let(:api_client) { Runtime::API::Client.new(:gitlab, ip_limits: true) } + let(:request) { Runtime::API::Request.new(api_client, '/users') } it 'GET /users' do 5.times do diff --git a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb index ce8425cb3d1..ac5db53ad40 100644 --- a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb @@ -8,7 +8,7 @@ module QA describe 'Compare archives of different user projects with the same name and check they\'re different' do include Support::Api - before(:all) do + before do @project_name = "project-archive-download-#{SecureRandom.hex(8)}" @archive_types = %w(tar.gz tar.bz2 tar zip) @users = { diff --git a/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap b/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap index 11d65ced180..b29d093130a 100644 --- a/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap +++ b/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap @@ -11,7 +11,6 @@ exports[`JumpToNextDiscussionButton matches the snapshot 1`] = ` title="" > diff --git a/spec/frontend/sidebar/__snapshots__/confidential_issue_sidebar_spec.js.snap b/spec/frontend/sidebar/__snapshots__/confidential_issue_sidebar_spec.js.snap index fd1cfdb1b04..1f93336e755 100644 --- a/spec/frontend/sidebar/__snapshots__/confidential_issue_sidebar_spec.js.snap +++ b/spec/frontend/sidebar/__snapshots__/confidential_issue_sidebar_spec.js.snap @@ -14,7 +14,6 @@ exports[`Confidential Issue Sidebar Block renders for isConfidential = false and >