Merge branch 'fix-lfs-enabled-select-box' into 'master'
Fix `LFS enabled` select box. A refactor of the project edit page caused the `lfs_enabled` setting to be reverted to a non functioning state. This MR fixes that. This will most likely need to be ported back to 8.13 and 8.14. 8.12 contained the correct code. Fixes #24645 Related commits: -ea3bbbdef8
-da07c2e4d3
cc @stanhu @dblessing @dbalexandre @rymai See merge request !7716
This commit is contained in:
commit
c591768907
2 changed files with 31 additions and 6 deletions
|
@ -92,14 +92,15 @@
|
||||||
= project_feature_access_select(:wiki_access_level)
|
= project_feature_access_select(:wiki_access_level)
|
||||||
|
|
||||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||||
.checkbox
|
.row
|
||||||
= f.label :lfs_enabled do
|
.col-md-9
|
||||||
= f.check_box :lfs_enabled
|
= f.label :lfs_enabled, 'LFS', class: 'label-light'
|
||||||
%strong LFS
|
%span.help-block
|
||||||
%br
|
|
||||||
%span.descr
|
|
||||||
Git Large File Storage
|
Git Large File Storage
|
||||||
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
||||||
|
.col-md-3
|
||||||
|
= f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control', data: { field: 'lfs_enabled' }
|
||||||
|
|
||||||
|
|
||||||
- if Gitlab.config.registry.enabled
|
- if Gitlab.config.registry.enabled
|
||||||
.form-group.js-container-registry{ style: ("display: none;" if @project.project_feature.send(:repository_access_level) == 0) }
|
.form-group.js-container-registry{ style: ("display: none;" if @project.project_feature.send(:repository_access_level) == 0) }
|
||||||
|
|
24
spec/views/projects/edit.html.haml_spec.rb
Normal file
24
spec/views/projects/edit.html.haml_spec.rb
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe 'projects/edit' do
|
||||||
|
include Devise::Test::ControllerHelpers
|
||||||
|
|
||||||
|
let(:project) { create(:empty_project) }
|
||||||
|
let(:user) { create(:admin) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
assign(:project, project)
|
||||||
|
|
||||||
|
allow(controller).to receive(:current_user).and_return(user)
|
||||||
|
allow(view).to receive_messages(current_user: user, can?: true)
|
||||||
|
allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'LFS enabled setting' do
|
||||||
|
it 'displays the correct elements' do
|
||||||
|
render
|
||||||
|
expect(rendered).to have_select('project_lfs_enabled')
|
||||||
|
expect(rendered).to have_content('Git Large File Storage')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue