Commit d3606d83 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/removeVueLfsFeatureFlag' into 'master'

Remove Vue file list LFS badge feature flag

See merge request gitlab-org/gitlab!36175
parents fffe2335 806be97e
...@@ -5,7 +5,6 @@ import FileTable from './table/index.vue'; ...@@ -5,7 +5,6 @@ import FileTable from './table/index.vue';
import getRefMixin from '../mixins/get_ref'; import getRefMixin from '../mixins/get_ref';
import filesQuery from '../queries/files.query.graphql'; import filesQuery from '../queries/files.query.graphql';
import projectPathQuery from '../queries/project_path.query.graphql'; import projectPathQuery from '../queries/project_path.query.graphql';
import vueFileListLfsBadgeQuery from '../queries/vue_file_list_lfs_badge.query.graphql';
import FilePreview from './preview/index.vue'; import FilePreview from './preview/index.vue';
import { readmeFile } from '../utils/readme'; import { readmeFile } from '../utils/readme';
...@@ -21,9 +20,6 @@ export default { ...@@ -21,9 +20,6 @@ export default {
projectPath: { projectPath: {
query: projectPathQuery, query: projectPathQuery,
}, },
vueFileListLfsBadge: {
query: vueFileListLfsBadgeQuery,
},
}, },
props: { props: {
path: { path: {
...@@ -47,7 +43,6 @@ export default { ...@@ -47,7 +43,6 @@ export default {
blobs: [], blobs: [],
}, },
isLoadingFiles: false, isLoadingFiles: false,
vueFileListLfsBadge: false,
}; };
}, },
computed: { computed: {
...@@ -82,7 +77,6 @@ export default { ...@@ -82,7 +77,6 @@ export default {
path: this.path || '/', path: this.path || '/',
nextPageCursor: this.nextPageCursor, nextPageCursor: this.nextPageCursor,
pageSize: PAGE_SIZE, pageSize: PAGE_SIZE,
vueLfsEnabled: this.vueFileListLfsBadge,
}, },
}) })
.then(({ data }) => { .then(({ data }) => {
......
...@@ -24,7 +24,6 @@ export default function setupVueRepositoryList() { ...@@ -24,7 +24,6 @@ export default function setupVueRepositoryList() {
projectShortPath, projectShortPath,
ref, ref,
escapedRef, escapedRef,
vueFileListLfsBadge: gon.features?.vueFileListLfsBadge || false,
commits: [], commits: [],
}, },
}); });
......
...@@ -14,7 +14,6 @@ query Files( ...@@ -14,7 +14,6 @@ query Files(
$ref: String! $ref: String!
$pageSize: Int! $pageSize: Int!
$nextPageCursor: String $nextPageCursor: String
$vueLfsEnabled: Boolean = false
) { ) {
project(fullPath: $projectPath) { project(fullPath: $projectPath) {
repository { repository {
...@@ -47,7 +46,7 @@ query Files( ...@@ -47,7 +46,7 @@ query Files(
node { node {
...TreeEntry ...TreeEntry
webPath webPath
lfsOid @include(if: $vueLfsEnabled) lfsOid
} }
} }
pageInfo { pageInfo {
......
...@@ -11,10 +11,6 @@ class Projects::RefsController < Projects::ApplicationController ...@@ -11,10 +11,6 @@ class Projects::RefsController < Projects::ApplicationController
before_action :assign_ref_vars before_action :assign_ref_vars
before_action :authorize_download_code! before_action :authorize_download_code!
before_action only: [:logs_tree] do
push_frontend_feature_flag(:vue_file_list_lfs_badge, default_enabled: true)
end
def switch def switch
respond_to do |format| respond_to do |format|
format.html do format.html do
......
...@@ -15,10 +15,6 @@ class Projects::TreeController < Projects::ApplicationController ...@@ -15,10 +15,6 @@ class Projects::TreeController < Projects::ApplicationController
before_action :authorize_download_code! before_action :authorize_download_code!
before_action :authorize_edit_tree!, only: [:create_dir] before_action :authorize_edit_tree!, only: [:create_dir]
before_action only: [:show] do
push_frontend_feature_flag(:vue_file_list_lfs_badge, default_enabled: true)
end
def show def show
return render_404 unless @commit return render_404 unless @commit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment