diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-04 21:17:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-04 21:17:50 +0300 |
commit | 17a58755f31fcca5f6f42a4f7de1bbf1934dd038 (patch) | |
tree | 42b09381de05e0a8b046242f109d451ddf5cfff5 /app/assets/javascripts | |
parent | 1b723130416e59bdaef5d662a33f22ac1d3ce953 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 25 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/empty_state.vue b/app/assets/javascripts/environments/components/empty_state.vue index 977da12e8a9..36b9b647af7 100644 --- a/app/assets/javascripts/environments/components/empty_state.vue +++ b/app/assets/javascripts/environments/components/empty_state.vue @@ -12,10 +12,10 @@ export default { <template> <div class="empty-state"> <div class="text-content"> - <h4 class="blank-state-title js-blank-state-title"> + <h4 class="js-blank-state-title"> {{ s__("Environments|You don't have any environments right now") }} </h4> - <p class="blank-state-text"> + <p> {{ s__(`Environments|Environments are places where code gets deployed, such as staging or production.`) diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index 184bda4410f..e7bac11a27e 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -199,6 +199,7 @@ export default { requestAccessEnabled: true, highlightChangesClass: false, emailsDisabled: false, + showDiffPreviewInEmail: true, cveIdRequestEnabled: true, featureAccessLevelEveryone, featureAccessLevelMembers, @@ -762,6 +763,24 @@ export default { </project-setting-row> <project-setting-row class="mb-3"> <input + :value="showDiffPreviewInEmail" + type="hidden" + name="project[project_setting_attributes][show_diff_preview_in_email]" + /> + <gl-form-checkbox + v-model="showDiffPreviewInEmail" + name="project[project_setting_attributes][show_diff_preview_in_email]" + > + {{ s__('ProjectSettings|Include diff preview in merge request notification emails') }} + <template #help>{{ + s__( + 'ProjectSettings|Include the code diff preview on comment threads in merge request notification emails.', + ) + }}</template> + </gl-form-checkbox> + </project-setting-row> + <project-setting-row class="mb-3"> + <input :value="showDefaultAwardEmojis" type="hidden" name="project[project_setting_attributes][show_default_award_emojis]" diff --git a/app/assets/javascripts/persistent_user_callout.js b/app/assets/javascripts/persistent_user_callout.js index bc83844b8b9..b003302ec8e 100644 --- a/app/assets/javascripts/persistent_user_callout.js +++ b/app/assets/javascripts/persistent_user_callout.js @@ -7,10 +7,11 @@ const DEFERRED_LINK_CLASS = 'deferred-link'; export default class PersistentUserCallout { constructor(container, options = container.dataset) { - const { dismissEndpoint, featureId, deferLinks } = options; + const { dismissEndpoint, featureId, groupId, deferLinks } = options; this.container = container; this.dismissEndpoint = dismissEndpoint; this.featureId = featureId; + this.groupId = groupId; this.deferLinks = parseBoolean(deferLinks); this.init(); @@ -52,6 +53,7 @@ export default class PersistentUserCallout { axios .post(this.dismissEndpoint, { feature_name: this.featureId, + group_id: this.groupId, }) .then(() => { this.container.remove(); diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js index a7f8704b559..337c204c36a 100644 --- a/app/assets/javascripts/persistent_user_callouts.js +++ b/app/assets/javascripts/persistent_user_callouts.js @@ -10,6 +10,7 @@ const PERSISTENT_USER_CALLOUTS = [ '.js-new-user-signups-cap-reached', '.js-eoa-bronze-plan-banner', '.js-security-newsletter-callout', + '.js-approaching-seats-count-threshold', ]; const initCallouts = () => { |