GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2023-12-18T16:33:38Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3151Draft: Profile codequality improvements2023-12-18T16:33:38ZAhmed HemdanDraft: Profile codequality improvementsAhmed HemdanAhmed Hemdanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3150Update main.js2023-12-13T09:41:06ZPhil Hughesme@iamphill.comUpdate main.js## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3145Update tests.yml2023-06-08T08:00:18ZRoy ZwambagUpdate tests.yml## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?Roy ZwambagRoy Zwambaghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3141Draft: Add lorem ipsum file2023-03-23T19:20:12ZKos PalchykDraft: Add lorem ipsum file## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3133Draft: Adds documentation for autoremediation2021-12-08T14:41:31ZSean ArnoldDraft: Adds documentation for autoremediation## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #10409https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3125Draft: 10io update maven finder2021-07-29T11:04:38ZMarc ShawDraft: 10io update maven finder## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3116LARGE MR comparing 13.5 and 13.62021-01-12T14:43:47ZAndré LuísLARGE MR comparing 13.5 and 13.6## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #13https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3118Draft: Resolve "Test upload"2021-01-06T05:13:59ZDavid KimDraft: Resolve "Test upload"## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #11420https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3114WIP: DO NOT MERGE just a test2020-11-30T02:44:05ZCharlie AblettWIP: DO NOT MERGE just a test## What does this MR do?
Purposely raises an error in the graphql controller so I can see the error in the pipeline :)
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if...## What does this MR do?
Purposely raises an error in the graphql controller so I can see the error in the pipeline :)
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?Charlie AblettCharlie Abletthttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3112Resolve "Some projects have a non-working comment area for merge requests"2020-09-22T17:06:04ZMarc ShawResolve "Some projects have a non-working comment area for merge requests"## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #11https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2006WIP: Add logging to repository update workers2020-07-09T16:52:05ZCollenWIP: Add logging to repository update workers## What does this MR do?
Adds error logging for failed pull from and push to a remote repository to RepositoryUpdateRemoteMirrorWorker and RepositoryUpdateMirrorWorker.
## Why was this MR needed?
Users are only notified via the UI at ...## What does this MR do?
Adds error logging for failed pull from and push to a remote repository to RepositoryUpdateRemoteMirrorWorker and RepositoryUpdateMirrorWorker.
## Why was this MR needed?
Users are only notified via the UI at `/settings/repository`. It's helpful if this is captured in the logs as well, as requested by this customer: https://gitlab.zendesk.com/agent/tickets/78180.
/cc @MrChrisW @atharDouwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2599CE upstream2020-07-09T16:06:29ZNick ThomasCE upstreamThis is a testThis is a testhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2815Port "Implement `failure_reason` on `ci_builds`" to EE2020-07-09T16:06:26ZShinya MaedaPort "Implement `failure_reason` on `ci_builds`" to EE## What does this MR do?
Port "Implement `failure_reason` on `ci_builds`" to EE
```diff
> g di spec/services/ci/retry_build_service_spec.rb
diff --cc spec/services/ci/retry_build_service_spec.rb
index 7e7a68c947,ebd27f95fc..0000000000...## What does this MR do?
Port "Implement `failure_reason` on `ci_builds`" to EE
```diff
> g di spec/services/ci/retry_build_service_spec.rb
diff --cc spec/services/ci/retry_build_service_spec.rb
index 7e7a68c947,ebd27f95fc..0000000000
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@@ -22,8 -22,7 +22,8 @@@ describe Ci::RetryBuildService d
%i[type lock_version target_url base_tags
commit_id deployments erased_by_id last_deployment project_id
runner_id tag_taggings taggings tags trigger_request_id
- user_id auto_canceled_by_id retried failure_reason].freeze
+ user_id auto_canceled_by_id retried sourced_pipelines
- artifacts_file_store artifacts_metadata_store].freeze
++ artifacts_file_store artifacts_metadata_store failure_reason].freeze
shared_examples 'build duplication' do
let(:stage) do
```
## What are the relevant issue numbers?
- CE: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13937
- Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3723910.0Shinya MaedaShinya Maedahttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2784Replace SidebarHeightManager by CSS rules2020-07-09T16:06:25ZWinnie HellmannReplace SidebarHeightManager by CSS rulesThis is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13736/.
## What does this MR do?
Remove `SidebarHeightManager` and use CSS rules instead.
## Why was this MR needed?
Too many factors influenced the sidebar h...This is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13736/.
## What does this MR do?
Remove `SidebarHeightManager` and use CSS rules instead.
## Why was this MR needed?
Too many factors influenced the sidebar height leading to several regressions.
## Screenshots
![new-bulk-issue-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6bf1619d0f83cf914af5c53043cceca6/new-bulk-issue-sidebar.mp4)
![new-issue-board-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/569ee122ce6f8cbe3bf4c2afbad7369a/new-issue-board-sidebar.mp4)
![new-issue-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/656fa920f2ce22f0c23d1344e4333230/new-issue-sidebar.mp4)
![new-job-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2277404c95f102dd6d9fb8bfe7f49068/new-job-sidebar.mp4)
## What are the relevant issue numbers?
fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36447, fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36635, fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/368559.5Winnie HellmannWinnie Hellmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2862Removes default scope from sortable2020-07-09T16:06:24Zusername-removed-117638Removes default scope from sortable**EE Compatibility**
with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13558**EE Compatibility**
with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1355810.0username-removed-117638username-removed-117638https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2158WIP: Resolve "GitLab CE features to work with unlicensed EE instance"2020-07-09T15:42:12ZRubén DávilaWIP: Resolve "GitLab CE features to work with unlicensed EE instance"## What does this MR do?
- [x] [Block changes](https://gitlab.com/gitlab-org/gitlab-ee/blob/e191c17e24af7d7a9aa65935654feb1dee05fbea/app/models/license.rb#L112) only when the license (not trial) has expired.
- [ ] ~~No GitLab EE feat...## What does this MR do?
- [x] [Block changes](https://gitlab.com/gitlab-org/gitlab-ee/blob/e191c17e24af7d7a9aa65935654feb1dee05fbea/app/models/license.rb#L112) only when the license (not trial) has expired.
- [ ] ~~No GitLab EE features should work when there isn't a regular or trial license~~ (no action required here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2158#note_33240909)
- [x] Once the trial license expires, GitLab CE features should continue to work
- [ ] Once a trial license expires, there should be a notification and link to contact sales to purchase a full EE license
- [ ] If a regular license expires, the server should no longer function and require a renewal (this is current EE behaviour)
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #2500https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2141WIP: Bulk edit sidebar scroll fix2020-07-09T15:42:06Zusername-removed-408230WIP: Bulk edit sidebar scroll fixTODO: Move to CE and pick into stable.
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptanc...TODO: Move to CE and pick into stable.
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2113Small Pipeline schedules UI enhancements2020-07-09T15:41:49Zusername-removed-408230Small Pipeline schedules UI enhancements## What does this MR do?
- Makes interval pattern selector label font normal
- Makes revision selector toggle font normal, not monospace
### Before:
![Screen_Shot_2017-06-12_at_11.35.10_AM](/uploads/75cdfb10b1c9ce78937b5108e7e46b24/Scr...## What does this MR do?
- Makes interval pattern selector label font normal
- Makes revision selector toggle font normal, not monospace
### Before:
![Screen_Shot_2017-06-12_at_11.35.10_AM](/uploads/75cdfb10b1c9ce78937b5108e7e46b24/Screen_Shot_2017-06-12_at_11.35.10_AM.png)
![Screen_Shot_2017-06-12_at_11.35.02_AM](/uploads/bae1deb6a6b15f4ce54a9a5a0787e9cd/Screen_Shot_2017-06-12_at_11.35.02_AM.png)
### After:
![Screen_Shot_2017-06-12_at_11.37.00_AM](/uploads/11d056fabac8620fc90c9d4aed93dca8/Screen_Shot_2017-06-12_at_11.37.00_AM.png)
![Screen_Shot_2017-06-12_at_11.38.26_AM](/uploads/6020aa0bd5dc687181064576ca1b9103/Screen_Shot_2017-06-12_at_11.38.26_AM.png)
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/325659.4https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2073Remove argument from http_url_to_repo call2020-07-09T15:41:49ZDouwe MaanRemove argument from http_url_to_repo callFixes https://gitlab.com/gitlab-org/gitlab-ee/builds/18130782Fixes https://gitlab.com/gitlab-org/gitlab-ee/builds/18130782Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2133Remove duplicate Project after_validation entry2020-07-09T15:41:48ZStan HuRemove duplicate Project after_validation entryNoticed this while reconciling conflicts.Noticed this while reconciling conflicts.James LopezJames Lopez