openproject

Commit Graph

Author	SHA1	Message	Date
Markus Kahl	2bf74725b2	fixed password confirmation during token reset (#9314 )	4 years ago
ulferts	6cda6ad4fd	enforces dependent project modules being active (#9311 ) Project modules, e.g. calendar can define dependencies, e.g. work packages. An error message is now displayed if a user enables a project module without the dependency being active in the project as well. Also fixes a serious bug in the Shared::ServiceContext module. Whenever a failing service result is returned, every change to the database is to be rolled back. This was not true when a model was provided since the changes where carried out within an inner transaction	4 years ago
Oliver Günther	c9a80b8653	[#37299 ] Remove validation for project identifier presence (#9296 ) [OP#37299](https://community.openproject.org/wp/37299)	4 years ago
Oliver Günther	9630b74524	Use format_time to format backup time (#9309 ) https://community.openproject.org/wp/37298	4 years ago
ulferts	0c2d87b4eb	choose wp type by position only (#9297 ) There was a misconception in the code related to the `is_default` field. The `is_default` field only governs whether a type is enabled by default in a new project or not.	4 years ago
ulferts	08ce0a5436	Fix/attachment journalizing (#9292 ) * update the container timestamp upon attachment creation That way, the journal subsequently created on the journalized container will bear the expected timestamp * update container timestamp on attachment deletion Without it, the journal created after the deletion will bear the wrong timestamp * avoid bumping lock_version on attachment adding/destroy	4 years ago
Oliver Günther	2cf8cd0d84	[37290] Use login service for logging in user (#9290 ) This correctly sets the last login date among other things https://community.openproject.org/wp/37290	4 years ago
Oliver Günther	cac2bf8716	[37262] Fix modal header icons (#9285 ) * [37262] Fix modal header icons https://community.openproject.org/work_packages/37262 * Add autoheight to onboarding modal * Render avatar of the user * Fix different padding for header and align all center This allows to render different things, not just icons (avatar) while centering all correctly	4 years ago
ulferts	0eae14072e	translate "overview" copy option	4 years ago
Oliver Günther	32cbff3a78	[37197] Use setting names in error messages (#9286 ) This avoids wrongly translated content https://community.openproject.org/work_packages/37197	4 years ago
Oliver Günther	ec56455edd	[37124] Handle the case when estimated hours was set to 0.0 (#9280 ) https://community.openproject.org/wp/37124	4 years ago
ulferts	9edc7244a9	fix displaying `multi` toggle in cf form (#9269 )	4 years ago
Oliver Günther	1ac2de19ff	[35328] Allow more default overrides (#9262 )	4 years ago
Oliver Günther	6c75e16dc4	[37140] Use acts_as_url to generate unique slug for identifier (#9250 ) * Use acts_as_url to generate unique slug for identifier * Re-enable project identifier spec now handled in backend * Add integration spec for set attribute service * Adapt spec for new empty identifier * Avoid double error messages for empty identifier acts_as_url may return an empty string depending on the name, but the empty presence validation will suffice in this case, we don't need the invalid validation * Fix stubbed errors object accessed by acts_as_url * Avoid trying to get the upstream unique attribute in case of errors * Remove sequential_project_identifiers setting * Adapt spec to review feedback	4 years ago
Oliver Günther	2f09095524	[36720] Disable login button after submit (#9254 )	4 years ago
Oliver Günther	af4922ebf6	[37124] Add formatter classes for estimated hours and generalize (#9252 ) Only xls exporter had formatter classes which are generic enough to replace all other exporter formating methods. https://community.openproject.org/wp/37124	4 years ago
ulferts	d90d47e6b6	Feature/user invite from members for non admins (#9244 ) * users having manage_user can add users from member administration * linting and typo correction	4 years ago
Oliver Günther	fa3481523b	Avoid running oauth cleanup job after every authentication (#9241 ) * Avoid running oauth cleanup job after every authentication * Also run attachments job as 'cron' job	4 years ago
ulferts	1f18dfca1a	legacy_spec to spec	4 years ago
Behrokh Satarnejad	d3902c9177	check not built in users for setting applicable admin (#9231 )	4 years ago
Oliver Günther	3611c63098	Add distributed tracing to Sentry (#9181 )	4 years ago
Oliver Günther	375554277a	Add storage tab shown at the project settings (#9224 ) * Add storage tab shown at the project settings * Remove unused project settings fields	4 years ago
Markus Kahl	6156d4b837	fixed attachments deletion in backup_job, and more (#9221 )	4 years ago
ulferts	fb04330c06	seed user permissions to global role (#9212 ) * seed user permissions to global role The i18n key was altered deliberatly to trigger retranslation * stay below 30 chars limit on role name	4 years ago
Oliver Günther	2adce94853	Implement copy form in formly (#9218 ) * Implement copy form in formly * Add meta property handling to dynamic form * Remove copy projects controller, merge into projects * Fix copying of container attachments * Fix project copy path * Fix remainder of copy spec	4 years ago
ulferts	b50298eb30	Feature/send custom message from invite modal (#9222 ) * fix malformed i18n key * sent custom message from invite modal * cleanup imports	4 years ago
ulferts	5cb227796c	Fix/hook service to openproject (#9214 ) * move specs from legacy * move Hook into OpenProject namespace * replace class variables	4 years ago
Oliver Günther	71b330ea80	[37026] Add new project form with template selection (#9193 ) * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * Provide DynamicFieldsService in root so it can be used independently * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * _isResourceSchema based on parent?.location * Scope DynamicFieldsService to DynamicFormComponent * Added backend validation method to FormsService * Remove form from DynamicForm when not isStandaloneForm * Allow multiple form keys to validate * Remove form from non standalone forms * Remove duplicated button * Fix: dynamic form with ng-template not showing validations * DynamicForm programatic validation * Add new project component that posts to the copy form * Hide the submit button input * Unify ckeditor spacings with other dynamic-form elements * Basic fixes to invalid dynamic form fields * Load the templated projects with newly added action * Fix invalid styles for dynamic inputs * Updates to form styles, add op-form and op-fieldset * Soften inputs to 2px * Update input styles globally * Redirect to job status modal when response is job status * fix: load projects routes * Collapsible groups working * Fix: setTimeout datepicker to wait DOM ready * resourceId added to project settings form * fieldsLayoutConfig * formUrl & formHttpMethod @Inputs * Avoid replacing non ending '/form' strings * formUrl @Input * @Input model * identifier hidden * Populate the model * Add new project component * Tests removed * Show create message when creating new resource * Change location to rails * Add field_name helper for testing * Add form field helper classes and fix tests * Remove templated from copy for now * Fix more tests * Reset toolbar from dev * Skip identifier test * Set overflow to visible when expanded * Fix more tests * Rename data-field-name to data-qa-field-name * Review feedback * Uncollapse group fields when they contains errors * Fix text spec * Remove instantiate template service * Remove unnecessary ProjectController#create Co-authored-by: Aleix Suau <info@macrofonoestudio.es> Co-authored-by: Benjamin Bädorf <b.baedorf@openproject.com>	4 years ago
ulferts	ce5e06dde2	Fix/non matching pagination (#9202 ) * fix duplicates returned for wp list on multiple matching attachments/comments LEFT JOIN leads to potentially having multiple records returned if a search string is present in more than one attachment/comment. This is not a problem if we fetch work packages directly out of the query results but becomes problematic if only the id is fetched and then used to get the work packages by a subquery. * attachment filters no longer differentiate on tsv_where concatenation As EXISTS and NOT EXISTS is now used, the full string is always to be searched for so `and` concatenation is now always employed. * adapt spec Work packages that have no attachment at all are now also considered to match the filter if a "doesn`t contain" operator is used * less strict rspec rubocops for feature specs * cleanup code	4 years ago
Aleix Suau	f5d2a7467b	Feature/36382 multi selection for project custom fields base (#9164 ) * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * Provide DynamicFieldsService in root so it can be used independently * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * _isResourceSchema based on parent?.location * Scope DynamicFieldsService to DynamicFormComponent * Added backend validation method to FormsService * Remove form from DynamicForm when not isStandaloneForm * Allow multiple form keys to validate * Remove form from non standalone forms * Remove duplicated button * Fix: dynamic form with ng-template not showing validations * DynamicForm programatic validation * Hide the submit button input * Unify ckeditor spacings with other dynamic-form elements * Basic fixes to invalid dynamic form fields * Fix invalid styles for dynamic inputs * Updates to form styles, add op-form and op-fieldset * Soften inputs to 2px * Update input styles globally * Fix selectors in copy spec * Undo new project route Will be handled in separate PR * Add separate module for field controls Otherwise it will not be found in the FormattableEditField component * Fix paths now having a trailing slash due to ui-router * Remove new project lazy route * Add data attribute to locate fields * Fix spec by locating field with data * Accept that ng-select can be cut off No idea why that changed in this PR though? * Fix success message to match tests * Redirect settings to generic to match angular path * Fix other project spec * Remove fdescribe * Fix missing cv with magic wait time for now * Remove broken angular tests * Fix routing spec * Import field controls module in wp module * Wait after inserting link into ckeditor It looks like the formly field doesn't get the current ckeditor value before saving * Decouple settings fetching from dynamicform mode (Standalone/FormControl) Co-authored-by: Oliver Günther <mail@oliverguenther.de> Co-authored-by: Benjamin Bädorf <b.baedorf@openproject.com>	4 years ago
Oliver Günther	2896afe6c4	Assign project identifier in backend (#9196 ) * Introduce localizable slug url Stringex currently works only with english strings for wiki. But that default is actually confusing. Instead, add an explicit localizable helper that receives the locale and sets the stringex backend locale temporarily * Generate a default identifier in the backend * Remove JS based identifier updating * Remove identifier attribute * Add button to change identifier * Adapt tests to changed identifier * Linting * Fix invalid selector	4 years ago
Oliver Günther	6086f320e8	[37036] Always return user attributes when sync_users enabled When a synchronized group has sync_users enabled, we want to synchronize the user to OpenProject even if the connection doesn't have onthefly_register enabled. But currently, the user attributes (name, mail, etc.) are only returned if onthefly_register is set so the synchronization will never work without it being set on the connnection https://community.openproject.org/wp/37036	4 years ago
Markus Kahl	8c8b8bbfa7	create backups via UI (#9136 ) * create backups via UI * Fix import of modal service * introduced backup token and addressed remaining comments * allow disabling permissions * improvements - only make user wait to use backup token in if really necessary - notify admins of new backup token - disable 'include attachments' option in UI if unavailable - documentation - misc * spec fixes * fixed feature spec * allow setting capybara host in every case * removed unused style file * addressed review feedback, added further feature specs * polish (code climate) * Avoid empty attachments * Don't raise filesize validation for internal exports Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
ulferts	0bec3cb8c2	fix namespace of actions (#9195 ) The actions are now more rubyish again which will reflect in the urls where we also have an underscore based pattern	4 years ago
ulferts	21f1cd2cc3	Feature/project action filter (#9194 ) * define action for copy projects permission * introduce filtering project list by current user action	4 years ago
Oliver Günther	5920ace376	[37024] Make system user permanent admin (#9192 ) * [37024] Make system user permanent admin https://community.openproject.org/wp/37024 * Yield self from run_given * Fix count for admin in bim seeder	4 years ago
Oliver Günther	06bcfbbb06	Add user job to provide system user with privileges (#9191 )	4 years ago
ulferts	1f32407ff9	Feature/project status resource (#9190 ) * model project status as separate resource Also fixes the structure of the projects api documentation * introduce project status resource * link to project status in project resource * adapt to status resource in frontend * describe project status in project schema * adapt project form specs * adapt copy project to project status	4 years ago
Oliver Günther	1963bd9c65	Correct error message output	4 years ago
ulferts	d1f419385f	Feature/member custom notifications (#9173 ) * include custom message in membership forms * keep pristine params to be able to pass it to the state * fix indentation on projects api docs * pass grape instance around in default endpoints The grape instance has readily available access to all the objects (params, current_user) so less individual parameters need to be passed. This also avoids having to store the grape endpoint in a potentials not thread safe variable * send custom message out on membership creation * send custom message on membership update * send custom message even if setting disabled * restore params interface * add custom message description to schema * describe notificationMessage in the api documentation * extract meta payload functionality into mixin * ensure password in spec meets requirements * Update docs/api/apiv3/endpoints/members.apib Co-authored-by: Oliver Günther <mail@oliverguenther.de> * Update docs/api/apiv3/endpoints/members.apib Co-authored-by: Oliver Günther <mail@oliverguenther.de> * Update docs/api/apiv3/endpoints/members.apib Co-authored-by: Oliver Günther <mail@oliverguenther.de> * Update docs/api/apiv3/endpoints/members.apib Co-authored-by: Oliver Günther <mail@oliverguenther.de> * Update docs/api/apiv3/endpoints/members.apib Co-authored-by: Oliver Günther <mail@oliverguenther.de> Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
ulferts	9ba51e7db0	fix touching the project on archiving/unarchiving (#9187 ) Without the touch, the cached project representers are not updated	4 years ago
Oliver Günther	820d2b4178	[37014] Remove any special characters from target filename https://community.openproject.org/wp/37014	4 years ago
Oliver Günther	6dc662b1e4	[36243][30226] Different avatars for placeholders and groups (#9169 ) * Fix members autocompleter to allow hrefs * Add rendering of different avatar types * Remove unused code in backend avatar rendering * Add very basic test that the avatar gets customized per type * Allow avatar rendering in the CreateAutocompleter * Restructure avatars into BEM css * Remove avatar-classes in favor of passing size from backend * Remove to avoid confusion We use tracking with both href and , and was introduced to avoid a property called href to be overridden, but that was never a problem before. So from now we can safely use .href * Fix broken principal avatar in user activity * Ensure filters get updated even if the form is not reloaded There was a bug in conditionallyLoadForm that checked the property of link (always undefined) and would thus always reload a form. What we actually need is a form that gets reloaded only when the query link changes, but still update services from the updated query, such as filters * Adapt specs to changes classes * Rename op-principal-avatar to op-avatar	4 years ago
Matthew Trescott	1af65d3b6c	Replace custom i18n function in committers settings Missed in #8679. See also #8681	4 years ago
ulferts	651f115300	limit any_name_attribute filter operators `=` and `!` used to be supported but resulted in comparing the concatenation of first/last-name, login and mail as a whole and not individually. As the filter is mostly used as a fuzzy search, it is ok to only support contains and not contains.	4 years ago
Oliver Günther	174427fc05	Remove duplicate not_locked scope (#9166 ) * Remove duplicate not_locked scope The enum itself creates scopes but they do not include not_builtion. So instead, let's create these scopes ourselves * Change enterprise spec to no longer test for builtin users	4 years ago
ulferts	9fa5599392	Feature/member notifications (#8958 ) * spec with correctly scoped links * move db check into own file - fix deprecation * basic spec for member creation service * use constants for all notifications * send an OP notification after member has been created * send an OP notification after member has been updated * mails on group member added Depending on whether the membership existed before or not, an updated or a created notification is send. This is done asynchronously. * move all mail sender background jobs into namespace * wip * wip * correct handling group member notifications * add setting enable/disable mail sending on member alterations * use services in members controller * move Notifiable to OpenProject * remove member after save hooks * cleanup/testing/linting * render member mails in receiver locale * remove add_member! method * use mailer layout for all mailers * Update app/services/groups/cleanup_inherited_roles_service.rb Co-authored-by: Oliver Günther <mail@oliverguenther.de> * use around callback to avoid prepending * handle nil params Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
Benjamin Bädorf	3f3e831f6a	Add any name attribute filter to principal resource collection (#9170 )	4 years ago
Benjamin Bädorf	64143001fc	Set moment locale globally (#9040 ) * Set moment locale globally This sets the moment locale to the application locale globally, ensuring that moment uses the right translation strings wherever applicable. However, since we only work with languages (en), and not real locales (en-US), the first day of year calculation has to default to some option. This commit defaults to ISO 8601 for every language and locale. * Add setting to mark dayOfYear * Fix NaN check * Add spec for switching settings * Output uniq github specs Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
Oliver Günther	f50297227b	[34444] Projects copy APIv3 (#9149 ) * Create copy project endpoint * Add representers * Add _meta representer for copy module information * Add Meta payload representer * Extract parsing of copy attributes into service * Extract enqueue job for projects copy * Keep request object available in the bodied endpoint this allows us to access grape (e.g., for redirecting) * Add DelayedModify endpoint that redirects to job status * Use DelayedModify endpoint for copying projects * Add api paths for form/copy * Disable cache on ProjectCopyPayload * Add spec * Add resource spec * Extend schema for meta * Extend docs * Don't pass service result, but state as meta to forms * Use copy dependencies for naming copy options in API * Add description property for counting * Remove unused action attribute * Skip writable checks on meta property for payloads * Use prepend to allow create(...) usage with meta * Extend copy spec with custom fields usage * Add spec for copy flags * Add todos * Pass errors correctly to copy settings * Remove invalid parameters to copy that are now caught through project service * Remove duplicated validation * Linting * Make count a human readable, formattable description string * Make source count string readable * Provide the source project for generating the counts * Extract copying of attachments into sepearate dependent services This will allow the API to dynamically generate a copy association schema from each dependent service * Add spec for copy schema representer * Add payload representer spec * Also validate the model to pass the validations when copying * Make description optional and add note to schemas.apib * Add send_notifications to representer * Allow to configure sendNotifications * Allow bodied to receive a state process callback That allows us to manage the meta state on the API level, not on the service level * Make other services compatible with BaseCallable * Fix params passing from BaseCallable Wrapping a single hash into kwargs obviously loses their key indifference and we can't expect all services to use a single params object. Older services use kwargs * Copy wiki page with parent_id This will save some memory instead of memoizing the entire wiki page * Fix typo * Default to true for all copy associations That means if only a true value is passed, all other options will still be true * Do not try to copy attachments if the base dependency wasnt copied * Ensure null identifier gets rendered * Fix paths to the form and commit * Change redirect to an URL * Extend documentation on meta properties as table * Ensure we pass a default params if incoming params are nil Now that SetAttributes needs to splat params, they do no longer correctly get the no-param-default behavior of Ruby, so we need to explictly assign a default params hash * Fix expect for trailing path	4 years ago

... 4 5 6 7 8 ...

18831 Commits (92cc5a603e11eb6b8879ca7c8b3bd43be9b2f75e)