diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/javascripts/profile/profile.js | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/profile/profile.js')
-rw-r--r-- | app/assets/javascripts/profile/profile.js | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index af5beeb686c..93bc203d391 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -5,9 +5,6 @@ import axios from '~/lib/utils/axios_utils'; import { parseBoolean } from '~/lib/utils/common_utils'; import { parseRailsFormFields } from '~/lib/utils/forms'; import { Rails } from '~/lib/utils/rails_ujs'; -import TimezoneDropdown, { - formatTimezone, -} from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; import UserProfileSetStatusWrapper from '~/set_status_modal/user_profile_set_status_wrapper.vue'; export default class Profile { @@ -17,21 +14,12 @@ export default class Profile { this.setRepoRadio(); this.bindEvents(); this.initAvatarGlCrop(); - - this.$inputEl = $('#user_timezone'); - - this.timezoneDropdown = new TimezoneDropdown({ - $inputEl: this.$inputEl, - $dropdownEl: $('.js-timezone-dropdown'), - displayFormat: (selectedItem) => formatTimezone(selectedItem), - allowEmpty: true, - }); } initAvatarGlCrop() { const cropOpts = { filename: '.js-avatar-filename', - previewImage: '.avatar-image .avatar', + previewImage: '.avatar-image .gl-avatar', modalCrop: '.modal-profile-crop', pickImageEl: '.js-choose-user-avatar-button', uploadImageBtn: '.js-upload-user-avatar', |