diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-13 00:10:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-13 00:10:38 +0300 |
commit | 3b69a04945341516a2ed6a291769c50fe04336df (patch) | |
tree | 5910b5f0c80bf98aded05305bbaa7fd30d2742c4 /app/views | |
parent | e4cfc16da343c2008053ee09bb6af7145a6924cb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/show.html.haml | 41 |
2 files changed, 8 insertions, 35 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 9c18f963dd7..05aea2b343d 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -53,6 +53,8 @@ = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'specify-a-custom-cicd-configuration-file'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.gitlab_ui_checkbox_component :suggest_pipeline_enabled, s_('AdminSettings|Enable pipeline suggestion banner'), help_text: s_('AdminSettings|Display a banner on merge requests in projects with no pipelines to initiate steps to add a .gitlab-ci.yml file.') + - if Feature.enabled?(:enforce_runner_token_expires_at) + #js-runner-token-expiration-intervals{ data: runner_token_expiration_interval_attributes } = f.submit _('Save changes'), pajamas_button: true diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index a64968cdcbb..f38d6021b18 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -2,8 +2,6 @@ - page_title s_("Profiles|Edit Profile") - @content_class = "limit-container-width" unless fluid_layout - gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host -- availability = availability_values -- custom_emoji = @user.status&.customized? = gitlab_ui_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user js-edit-user gl-mt-3 js-quick-submit gl-show-field-errors js-password-prompt-form', remote: true }, authenticity_token: true do |f| .row.js-search-settings-section @@ -43,39 +41,12 @@ %h4.gl-mt-0= s_("Profiles|Current status") %p= s_("Profiles|This emoji and message will appear on your profile and throughout the interface.") .col-lg-8 - = f.fields_for :status, @user.status do |status_form| - - emoji_button = render Pajamas::ButtonComponent.new(button_options: { title: s_("Profiles|Add status emoji"), - class: 'js-toggle-emoji-menu emoji-menu-toggle-button has-tooltip' } ) do - - if custom_emoji - = emoji_icon(@user.status.emoji, class: 'gl-mr-0!') - %span#js-no-emoji-placeholder.no-emoji-placeholder{ class: ('hidden' if custom_emoji) } - = sprite_icon('slight-smile', css_class: 'award-control-icon-neutral') - = sprite_icon('smiley', css_class: 'award-control-icon-positive') - = sprite_icon('smile', css_class: 'award-control-icon-super-positive') - - reset_message_button = render Pajamas::ButtonComponent.new(icon: 'close', - button_options: { id: 'js-clear-user-status-button', - class: 'has-tooltip', - title: s_("Profiles|Clear status") } ) - - = status_form.hidden_field :emoji, id: 'js-status-emoji-field' - .form-group.gl-form-group - = status_form.label :message, s_("Profiles|Your status") - .input-group{ role: 'group' } - .input-group-prepend - = emoji_button - = status_form.text_field :message, - id: 'js-status-message-field', - class: 'form-control gl-form-input input-lg', - placeholder: s_("Profiles|What's your status?") - .input-group-append - = reset_message_button - .form-group.gl-form-group - = status_form.gitlab_ui_checkbox_component :availability, - s_("Profiles|Busy"), - help_text: s_('Profiles|An indicator appears next to your name and avatar.'), - checkbox_options: { data: { testid: "user-availability-checkbox" } }, - checked_value: availability["busy"], - unchecked_value: availability["not_set"] + #js-user-profile-set-status-form + = f.fields_for :status, @user.status do |status_form| + = status_form.hidden_field :emoji, data: { js_name: 'emoji' } + = status_form.hidden_field :message, data: { js_name: 'message' } + = status_form.hidden_field :availability, data: { js_name: 'availability' } + = status_form.hidden_field :clear_status_after, data: { js_name: 'clearStatusAfter' } .col-lg-12 %hr .row.user-time-preferences.js-search-settings-section |