diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 03:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 03:09:11 +0300 |
| commit | 6143ef2fb6772c50fde4e738412c5d511f9dcf15 (patch) | |
| tree | 5e55ef79bbf1543619e61cfd7e7ef1314132cc47 /app | |
| parent | 87731a5333142f369829341116ab2d4445e47d66 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/queries/commit.fragment.graphql | 1 |
2 files changed, 2 insertions, 1 deletions
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 11e6b4577e0..fde134f1440 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 @@ -221,7 +221,7 @@ export default { } if (this.visibilityLevel !== visibilityOptions.PUBLIC) { - options.push([30, PAGE_FEATURE_ACCESS_LEVEL]); + options.push([visibilityOptions.PUBLIC, PAGE_FEATURE_ACCESS_LEVEL]); } } return options; diff --git a/app/assets/javascripts/repository/queries/commit.fragment.graphql b/app/assets/javascripts/repository/queries/commit.fragment.graphql index be6897b9a16..b046fc1f730 100644 --- a/app/assets/javascripts/repository/queries/commit.fragment.graphql +++ b/app/assets/javascripts/repository/queries/commit.fragment.graphql @@ -5,5 +5,6 @@ fragment TreeEntryCommit on LogTreeCommit { committedDate commitPath fileName + filePath type } |