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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
cebad0fb
Commit
cebad0fb
authored
Sep 30, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not show Diff view switcher if all files are can be only resolved with an editor
parent
197ac5eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
...s/javascripts/merge_conflicts/merge_conflict_store.js.es6
+12
-0
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
...javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+2
-1
app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
...projects/merge_requests/conflicts/_commit_stats.html.haml
+1
-1
No files found.
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
View file @
cebad0fb
...
...
@@ -425,6 +425,18 @@
setSubmitState(state) {
this.state.isSubmitting = state;
},
fileTextTypePresent() {
let found = false;
this.state.conflictsData.files.find((f) => {
if (f.type === CONFLICT_TYPES.TEXT) {
return found = true;
}
});
return found;
}
};
...
...
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
View file @
cebad0fb
...
...
@@ -21,7 +21,8 @@ $(() => {
computed: {
conflictsCountText() { return mergeConflictsStore.getConflictsCountText() },
readyToCommit() { return mergeConflictsStore.isReadyToCommit() },
commitButtonText() { return mergeConflictsStore.getCommitButtonText() }
commitButtonText() { return mergeConflictsStore.getCommitButtonText() },
showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent() }
},
created() {
mergeConflictsService
...
...
app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
View file @
cebad0fb
.content-block.oneline-block.files-changed
{
"v-if"
=>
"!isLoading && !hasError"
}
.inline-parallel-buttons
.inline-parallel-buttons
{
"v-if"
=>
"showDiffViewTypeSwitcher"
}
.btn-group
%a
.btn
{
|
":class"
=>
"{'active': !isParallel}"
,
|
...
...
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