Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b3d15ebd
Commit
b3d15ebd
authored
Jul 21, 2021
by
Jacques Erasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix aux viewers
This fixes the Auxiliary viewers on the refactored blob view
parent
c83cf1f8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
151 additions
and
143 deletions
+151
-143
app/assets/javascripts/pages/projects/blob/show/index.js
app/assets/javascripts/pages/projects/blob/show/index.js
+3
-1
spec/features/projects/blobs/blob_show_spec.rb
spec/features/projects/blobs/blob_show_spec.rb
+148
-142
No files found.
app/assets/javascripts/pages/projects/blob/show/index.js
View file @
b3d15ebd
...
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
VueApollo
from
'
vue-apollo
'
;
import
TableOfContents
from
'
~/blob/components/table_contents.vue
'
;
import
PipelineTourSuccessModal
from
'
~/blob/pipeline_tour_success_modal.vue
'
;
import
{
BlobViewer
}
from
'
~/blob/viewer/index
'
;
import
{
BlobViewer
,
initAuxiliaryViewer
}
from
'
~/blob/viewer/index
'
;
import
GpgBadges
from
'
~/gpg_badges
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
initBlob
from
'
~/pages/projects/init_blob
'
;
...
...
@@ -39,6 +39,8 @@ if (viewBlobEl) {
});
},
});
initAuxiliaryViewer
();
}
else
{
new
BlobViewer
();
// eslint-disable-line no-new
initBlob
();
...
...
spec/features/projects/blobs/blob_show_spec.rb
View file @
b3d15ebd
...
...
@@ -584,6 +584,11 @@ RSpec.describe 'File blob', :js do
end
end
context
'files with auxiliary viewers'
do
before
do
stub_feature_flags
(
refactor_blob_viewer:
true
)
end
describe
'.gitlab-ci.yml'
do
before
do
project
.
add_maintainer
(
project
.
creator
)
...
...
@@ -780,6 +785,7 @@ RSpec.describe 'File blob', :js do
end
end
end
end
context
'realtime pipelines'
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment