diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-29 15:07:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-29 15:07:49 +0300 |
| commit | d1fe6b3349f1e8cb8477630448f9933e364a1ca8 (patch) | |
| tree | 7caa656f2e464b3e14184f81952d64d01f94ef43 | |
| parent | a955f4024d40663f4b1affd74a346ffc96a92371 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 2 | ||||
| -rw-r--r-- | config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index d112fd83ebf..b30ec4b4253 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -259,7 +259,7 @@ $tabs-holder-z-index: 250; position: sticky; top: calc(#{$calc-application-header-height} + #{$mr-tabs-height} + #{$diff-file-header-top}); // height calc is fully delegated to the tree_list_height.vue component - height: 0; + height: 100%; min-height: 300px; .drag-handle { diff --git a/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml b/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml new file mode 100644 index 00000000000..3edb367f5a2 --- /dev/null +++ b/config/feature_flags/gitlab_com_derisk/prevent_modifications_of_mr_rules_post_merge.yml @@ -0,0 +1,9 @@ +--- +name: prevent_modifications_of_mr_rules_post_merge +feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432961 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138154 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17331 +milestone: '16.8' +group: group::code review +type: gitlab_com_derisk +default_enabled: false |