From 47b5ca54362fa51c08f4525415bb6887b8a7ba92 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 4 Aug 2021 03:09:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitpod.yml | 4 +- .../codequality_report/store/actions.js | 5 +- app/views/profiles/show.html.haml | 6 +- doc/.vale/gitlab/SubstitutionWarning.yml | 1 + doc/administration/img/time_zone_settings.png | Bin 15330 -> 0 bytes doc/administration/timezone.md | 13 +--- doc/user/profile/index.md | 8 ++ locale/gitlab.pot | 9 ++- .../stack_traces_controller_spec.rb | 2 +- .../error_tracking_controller_spec.rb | 6 +- .../error_tracking/detailed_error.rb | 2 +- spec/factories/error_tracking/error.rb | 13 +++- spec/factories/error_tracking/error_event.rb | 13 +++- .../codequality_report/store/actions_spec.js | 69 +++++++++++++++++- .../sentry_detailed_error_resolver_spec.rb | 2 +- .../stack_trace_highlight_decorator_spec.rb | 2 +- .../project_error_tracking_setting_spec.rb | 2 +- .../presenters/sentry_error_presenter_spec.rb | 2 +- .../sentry_detailed_error_request_spec.rb | 2 +- .../sentry_errors_request_spec.rb | 6 +- .../issue_details_service_spec.rb | 2 +- .../issue_latest_event_service_spec.rb | 2 +- 22 files changed, 131 insertions(+), 40 deletions(-) delete mode 100644 doc/administration/img/time_zone_settings.png diff --git a/.gitpod.yml b/.gitpod.yml index 0cb0e55c373..7642cfce294 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -63,8 +63,10 @@ tasks: ) ports: - - port: 3000 # rails-web + - port: 2222 # sshd onOpen: ignore + - port: 3000 # rails-web + onOpen: notify - port: 3010 # gitlab-pages onOpen: ignore - port: 3808 # webpack diff --git a/app/assets/javascripts/reports/codequality_report/store/actions.js b/app/assets/javascripts/reports/codequality_report/store/actions.js index e3238207af2..33005ec0e9e 100644 --- a/app/assets/javascripts/reports/codequality_report/store/actions.js +++ b/app/assets/javascripts/reports/codequality_report/store/actions.js @@ -1,4 +1,4 @@ -import axios from '~/lib/utils/axios_utils'; +import pollUntilComplete from '~/lib/utils/poll_until_complete'; import * as types from './mutation_types'; import { parseCodeclimateMetrics } from './utils/codequality_parser'; @@ -10,8 +10,7 @@ export const fetchReports = ({ state, dispatch, commit }) => { if (!state.basePath) { return dispatch('receiveReportsError'); } - return axios - .get(state.reportsPath) + return pollUntilComplete(state.reportsPath) .then(({ data }) => { return dispatch('receiveReportsSuccess', { newIssues: parseCodeclimateMetrics(data.new_errors, state.headBlobPath), diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 0328fa5c282..cb68d31c06f 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -77,12 +77,10 @@ .row.user-time-preferences.js-search-settings-section .col-lg-4.profile-settings-sidebar %h4.gl-mt-0= s_("Profiles|Time settings") - %p= s_("Profiles|You can set your current timezone here") + %p= s_("Profiles|Set your local time zone") .col-lg-8 - -# TODO: might need an entry in user/profile.md to describe some of these settings - -# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070 %h5= _("Time zone") - = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) + = dropdown_tag(_("Select a time zone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a time zone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone } .col-lg-12 %hr diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml index 50ac97bc227..3bedc5837cf 100644 --- a/doc/.vale/gitlab/SubstitutionWarning.yml +++ b/doc/.vale/gitlab/SubstitutionWarning.yml @@ -18,6 +18,7 @@ swap: filesystem: file system info: information repo: repository + timezone: time zone utilize: use administrator access: the Administrator role administrator permission: the Administrator role diff --git a/doc/administration/img/time_zone_settings.png b/doc/administration/img/time_zone_settings.png deleted file mode 100644 index e735a8bc5ec738a472bcdf56bd615a4da00215d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15330 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 diff --git a/doc/administration/timezone.md b/doc/administration/timezone.md index 0006a442ec9..b6076c8ed26 100644 --- a/doc/administration/timezone.md +++ b/doc/administration/timezone.md @@ -48,13 +48,8 @@ gitlab-ctl restart > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 13.9. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 14.1. -This setting controls the local time displayed on a user's profile. -See [&280](https://gitlab.com/groups/gitlab-org/-/epics/280) for other planned features. +A user can set their time zone in their profile. If a user has not set their time zone, it defaults +to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the +default time zone is UTC. -NOTE: -If a user has not set their time zone, it defaults to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the default time zone is UTC. - -1. Navigate to [your user settings](../user/profile/index.md#access-your-user-settings). -1. Select your time zone from the dropdown. - -![User Time Zone Settings](img/time_zone_settings.png) +For more information, see [Set your time zone](../user/profile/index.md#set-your-time-zone). diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 28061d3a676..29b81e14e00 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -192,6 +192,14 @@ To set the busy status indicator, either: | --- | --- | | ![Busy status - notes](img/busy_indicator_notes_v13_9.png) | ![Busy status - note header](img/busy_indicator_note_header_v13_9.png) | +## Set your time zone + +To set your time zone: + +1. In the top-right corner, select your avatar. +1. Select **Edit profile**. +1. In the **Time settings** section, select your time zone from the dropdown list. + ## Change the email displayed on your commits A commit email is an email address displayed in every Git-related action carried out through the GitLab interface. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 22e6e93d553..34861588c4a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -25410,6 +25410,9 @@ msgstr "" msgid "Profiles|Set new profile picture" msgstr "" +msgid "Profiles|Set your local time zone" +msgstr "" + msgid "Profiles|Social sign-in" msgstr "" @@ -25491,9 +25494,6 @@ msgstr "" msgid "Profiles|You can change your avatar here or remove the current avatar to revert to %{gravatar_link}" msgstr "" -msgid "Profiles|You can set your current timezone here" -msgstr "" - msgid "Profiles|You can upload your avatar here" msgstr "" @@ -29742,6 +29742,9 @@ msgstr "" msgid "Select a template type" msgstr "" +msgid "Select a time zone" +msgstr "" + msgid "Select a timezone" msgstr "" diff --git a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb index 7c080504c31..19b6b597a84 100644 --- a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb +++ b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb @@ -40,7 +40,7 @@ RSpec.describe Projects::ErrorTracking::StackTracesController do context 'service result is successful' do let(:service_response) { { status: :success, latest_event: error_event } } - let(:error_event) { build(:error_tracking_error_event) } + let(:error_event) { build(:error_tracking_sentry_error_event) } it 'responds with success' do expect(response).to have_gitlab_http_status(:ok) diff --git a/spec/controllers/projects/error_tracking_controller_spec.rb b/spec/controllers/projects/error_tracking_controller_spec.rb index 5ea885e4fd6..822778779eb 100644 --- a/spec/controllers/projects/error_tracking_controller_spec.rb +++ b/spec/controllers/projects/error_tracking_controller_spec.rb @@ -95,7 +95,7 @@ RSpec.describe Projects::ErrorTrackingController do get :index, params: params end - let(:error) { build(:error_tracking_error) } + let(:error) { build(:error_tracking_sentry_error) } it 'returns a list of errors' do expect(response).to have_gitlab_http_status(:ok) @@ -126,7 +126,7 @@ RSpec.describe Projects::ErrorTrackingController do .and_return(external_url) end - let(:error) { build(:error_tracking_error) } + let(:error) { build(:error_tracking_sentry_error) } it 'returns a list of errors' do get :index, params: project_params(format: :json) @@ -221,7 +221,7 @@ RSpec.describe Projects::ErrorTrackingController do get :details, params: issue_params(issue_id: issue_id, format: :json) end - let(:error) { build(:detailed_error_tracking_error) } + let(:error) { build(:error_tracking_sentry_detailed_error) } it 'returns an error' do expected_error = error.as_json.except('first_release_version').merge( diff --git a/spec/factories/error_tracking/detailed_error.rb b/spec/factories/error_tracking/detailed_error.rb index 83004ffae38..c2e5741b150 100644 --- a/spec/factories/error_tracking/detailed_error.rb +++ b/spec/factories/error_tracking/detailed_error.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true FactoryBot.define do - factory :detailed_error_tracking_error, parent: :error_tracking_error, class: 'Gitlab::ErrorTracking::DetailedError' do + factory :error_tracking_sentry_detailed_error, parent: :error_tracking_sentry_error, class: 'Gitlab::ErrorTracking::DetailedError' do gitlab_issue { 'http://gitlab.example.com/issues/1' } external_base_url { 'http://example.com' } first_release_last_commit { '68c914da9' } diff --git a/spec/factories/error_tracking/error.rb b/spec/factories/error_tracking/error.rb index e5f2e2ca9a7..cd2df351abe 100644 --- a/spec/factories/error_tracking/error.rb +++ b/spec/factories/error_tracking/error.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true FactoryBot.define do - factory :error_tracking_error, class: 'Gitlab::ErrorTracking::Error' do + # There is an issue to rename this class https://gitlab.com/gitlab-org/gitlab/-/issues/323342. + factory :error_tracking_sentry_error, class: 'Gitlab::ErrorTracking::Error' do id { '1' } title { 'title' } type { 'error' } @@ -25,4 +26,14 @@ FactoryBot.define do skip_create end + + factory :error_tracking_error, class: 'ErrorTracking::Error' do + project + name { 'ActionView::MissingTemplate' } + description { 'Missing template posts/edit' } + actor { 'PostsController#edit' } + platform { 'ruby' } + first_seen_at { Time.now.iso8601 } + last_seen_at { Time.now.iso8601 } + end end diff --git a/spec/factories/error_tracking/error_event.rb b/spec/factories/error_tracking/error_event.rb index 880fdf17fae..9620e3999d6 100644 --- a/spec/factories/error_tracking/error_event.rb +++ b/spec/factories/error_tracking/error_event.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true FactoryBot.define do - factory :error_tracking_error_event, class: 'Gitlab::ErrorTracking::ErrorEvent' do + # There is an issue to rename this class https://gitlab.com/gitlab-org/gitlab/-/issues/323342. + factory :error_tracking_sentry_error_event, class: 'Gitlab::ErrorTracking::ErrorEvent' do issue_id { 'id' } date_received { Time.now.iso8601 } stack_trace_entries do @@ -53,4 +54,14 @@ FactoryBot.define do skip_create end + + factory :error_tracking_error_event, class: 'ErrorTracking::ErrorEvent' do + error factory: :error_tracking_error + + description { 'ActionView::MissingTemplate' } + environment { 'development' } + level { 'error' } + occurred_at { Time.now.iso8601 } + payload { Gitlab::Json.parse(File.read(Rails.root.join('spec/fixtures/', 'error_tracking/parsed_event.json'))) } + end end diff --git a/spec/frontend/reports/codequality_report/store/actions_spec.js b/spec/frontend/reports/codequality_report/store/actions_spec.js index 9dda024bffd..2255b676074 100644 --- a/spec/frontend/reports/codequality_report/store/actions_spec.js +++ b/spec/frontend/reports/codequality_report/store/actions_spec.js @@ -7,6 +7,11 @@ import * as actions from '~/reports/codequality_report/store/actions'; import * as types from '~/reports/codequality_report/store/mutation_types'; import { reportIssues, parsedReportIssues } from '../mock_data'; +const pollInterval = 123; +const pollIntervalHeader = { + 'Poll-Interval': pollInterval, +}; + describe('Codequality Reports actions', () => { let localState; let localStore; @@ -39,10 +44,11 @@ describe('Codequality Reports actions', () => { }); describe('fetchReports', () => { + const endpoint = `${TEST_HOST}/codequality_reports.json`; let mock; beforeEach(() => { - localState.reportsPath = `${TEST_HOST}/codequality_reports.json`; + localState.reportsPath = endpoint; localState.basePath = '/base/path'; mock = new MockAdapter(axios); }); @@ -53,7 +59,7 @@ describe('Codequality Reports actions', () => { describe('on success', () => { it('commits REQUEST_REPORTS and dispatches receiveReportsSuccess', (done) => { - mock.onGet(`${TEST_HOST}/codequality_reports.json`).reply(200, reportIssues); + mock.onGet(endpoint).reply(200, reportIssues); testAction( actions.fetchReports, @@ -73,7 +79,7 @@ describe('Codequality Reports actions', () => { describe('on error', () => { it('commits REQUEST_REPORTS and dispatches receiveReportsError', (done) => { - mock.onGet(`${TEST_HOST}/codequality_reports.json`).reply(500); + mock.onGet(endpoint).reply(500); testAction( actions.fetchReports, @@ -100,6 +106,63 @@ describe('Codequality Reports actions', () => { ); }); }); + + describe('while waiting for report results', () => { + it('continues polling until it receives data', (done) => { + mock + .onGet(endpoint) + .replyOnce(204, undefined, pollIntervalHeader) + .onGet(endpoint) + .reply(200, reportIssues); + + Promise.all([ + testAction( + actions.fetchReports, + null, + localState, + [{ type: types.REQUEST_REPORTS }], + [ + { + payload: parsedReportIssues, + type: 'receiveReportsSuccess', + }, + ], + done, + ), + axios + // wait for initial NO_CONTENT response to be fulfilled + .waitForAll() + .then(() => { + jest.advanceTimersByTime(pollInterval); + }), + ]).catch(done.fail); + }); + + it('continues polling until it receives an error', (done) => { + mock + .onGet(endpoint) + .replyOnce(204, undefined, pollIntervalHeader) + .onGet(endpoint) + .reply(500); + + Promise.all([ + testAction( + actions.fetchReports, + null, + localState, + [{ type: types.REQUEST_REPORTS }], + [{ type: 'receiveReportsError', payload: expect.any(Error) }], + done, + ), + axios + // wait for initial NO_CONTENT response to be fulfilled + .waitForAll() + .then(() => { + jest.advanceTimersByTime(pollInterval); + }), + ]).catch(done.fail); + }); + }); }); describe('receiveReportsSuccess', () => { diff --git a/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb b/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb index bf8d2139c82..2aef483ac95 100644 --- a/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb +++ b/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb @@ -42,7 +42,7 @@ RSpec.describe Resolvers::ErrorTracking::SentryDetailedErrorResolver do end context 'error matched' do - let(:detailed_error) { build(:detailed_error_tracking_error) } + let(:detailed_error) { build(:error_tracking_sentry_detailed_error) } before do allow(issue_details_service).to receive(:execute) diff --git a/spec/lib/gitlab/error_tracking/stack_trace_highlight_decorator_spec.rb b/spec/lib/gitlab/error_tracking/stack_trace_highlight_decorator_spec.rb index 5c496d653b2..577d59798da 100644 --- a/spec/lib/gitlab/error_tracking/stack_trace_highlight_decorator_spec.rb +++ b/spec/lib/gitlab/error_tracking/stack_trace_highlight_decorator_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::ErrorTracking::StackTraceHighlightDecorator do - let(:error_event) { build(:error_tracking_error_event) } + let(:error_event) { build(:error_tracking_sentry_error_event) } describe '.decorate' do subject(:decorate) { described_class.decorate(error_event) } diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb index 3ae0666f7d0..bafa62c9543 100644 --- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb +++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb @@ -241,7 +241,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do end describe '#issue_details' do - let(:issue) { build(:detailed_error_tracking_error) } + let(:issue) { build(:error_tracking_sentry_detailed_error) } let(:sentry_client) { double('sentry_client', issue_details: issue) } let(:commit_id) { issue.first_release_version } diff --git a/spec/presenters/sentry_error_presenter_spec.rb b/spec/presenters/sentry_error_presenter_spec.rb index 86e43be1fa7..ce1b31d2371 100644 --- a/spec/presenters/sentry_error_presenter_spec.rb +++ b/spec/presenters/sentry_error_presenter_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe SentryErrorPresenter do - let(:error) { build(:detailed_error_tracking_error) } + let(:error) { build(:error_tracking_sentry_detailed_error) } let(:presenter) { described_class.new(error) } describe '#frequency' do diff --git a/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb b/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb index 14fabaaf032..40a3281d3b7 100644 --- a/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb +++ b/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb @@ -7,7 +7,7 @@ RSpec.describe 'getting a detailed sentry error' do let_it_be(:project) { create(:project, :repository) } let_it_be(:project_setting) { create(:project_error_tracking_setting, project: project) } let_it_be(:current_user) { project.owner } - let_it_be(:sentry_detailed_error) { build(:detailed_error_tracking_error) } + let_it_be(:sentry_detailed_error) { build(:error_tracking_sentry_detailed_error) } let(:sentry_gid) { sentry_detailed_error.to_global_id.to_s } let(:fields) do diff --git a/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb b/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb index e71e5a48ddc..80376f56ee8 100644 --- a/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb +++ b/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb @@ -16,7 +16,7 @@ RSpec.describe 'sentry errors requests' do end describe 'getting a detailed sentry error' do - let_it_be(:sentry_detailed_error) { build(:detailed_error_tracking_error) } + let_it_be(:sentry_detailed_error) { build(:error_tracking_sentry_detailed_error) } let(:sentry_gid) { sentry_detailed_error.to_global_id.to_s } @@ -97,7 +97,7 @@ RSpec.describe 'sentry errors requests' do end describe 'getting an errors list' do - let_it_be(:sentry_error) { build(:error_tracking_error) } + let_it_be(:sentry_error) { build(:error_tracking_sentry_error) } let_it_be(:pagination) do { 'next' => { 'cursor' => '2222' }, @@ -193,7 +193,7 @@ RSpec.describe 'sentry errors requests' do end describe 'getting a stack trace' do - let_it_be(:sentry_stack_trace) { build(:error_tracking_error_event) } + let_it_be(:sentry_stack_trace) { build(:error_tracking_sentry_error_event) } let(:sentry_gid) { global_id_of(Gitlab::ErrorTracking::DetailedError.new(id: 1)) } diff --git a/spec/services/error_tracking/issue_details_service_spec.rb b/spec/services/error_tracking/issue_details_service_spec.rb index 1954640a512..2880697e2ae 100644 --- a/spec/services/error_tracking/issue_details_service_spec.rb +++ b/spec/services/error_tracking/issue_details_service_spec.rb @@ -10,7 +10,7 @@ RSpec.describe ErrorTracking::IssueDetailsService do describe '#execute' do context 'with authorized user' do context 'when issue_details returns a detailed error' do - let(:detailed_error) { build(:detailed_error_tracking_error) } + let(:detailed_error) { build(:error_tracking_sentry_detailed_error) } let(:params) { { issue_id: detailed_error.id } } before do diff --git a/spec/services/error_tracking/issue_latest_event_service_spec.rb b/spec/services/error_tracking/issue_latest_event_service_spec.rb index b7560762ae4..82579418c10 100644 --- a/spec/services/error_tracking/issue_latest_event_service_spec.rb +++ b/spec/services/error_tracking/issue_latest_event_service_spec.rb @@ -10,7 +10,7 @@ RSpec.describe ErrorTracking::IssueLatestEventService do describe '#execute' do context 'with authorized user' do context 'when issue_latest_event returns an error event' do - let(:error_event) { build(:error_tracking_error_event) } + let(:error_event) { build(:error_tracking_sentry_error_event) } before do expect(error_tracking_setting)