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
Jérome Perrin
gitlab-ce
Commits
0039fcd3
Commit
0039fcd3
authored
Aug 08, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update button titles in merge conflicts widget header.
parent
41f7cee9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/merge_conflict_data_provider.js.es6
app/assets/javascripts/merge_conflict_data_provider.js.es6
+7
-2
app/views/projects/merge_requests/conflicts.html.haml
app/views/projects/merge_requests/conflicts.html.haml
+4
-2
No files found.
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file @
0039fcd3
const HEAD_HEADER_TEXT = 'HEAD//our changes';
const ORIGIN_HEADER_TEXT = 'origin//their changes';
const HEAD_BUTTON_TITLE = 'Use ours';
const ORIGIN_BUTTON_TITLE = 'Use theirs';
window.MergeConflictDataProvider = class MergeConflictDataProvider {
getInitialData() {
...
...
@@ -275,6 +278,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
return {
id : id,
richText : HEAD_HEADER_TEXT,
buttonTitle : HEAD_BUTTON_TITLE,
type : 'new',
section : 'head',
isHeader : true,
...
...
@@ -289,6 +293,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
return {
id : id,
richText : ORIGIN_HEADER_TEXT,
buttonTitle : ORIGIN_BUTTON_TITLE,
type : 'old',
section : 'origin',
isHeader : true,
...
...
app/views/projects/merge_requests/conflicts.html.haml
View file @
0039fcd3
...
...
@@ -62,7 +62,8 @@
'selected': line.isSelected, |
'unselected': line.isUnselected}"
}
%strong
{{line.richText}}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
Use this
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
{{line.buttonTitle}}
%template
{
"v-if"
=>
"!line.isHeader"
}
%td
.diff-line-num.old_line
{
":class"
=>
"{ |
...
...
@@ -113,7 +114,8 @@
%td
.diff-line-num.header
%td
.line_content.header
%strong
{{{line.richText}}}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
Use this
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
{{line.buttonTitle}}
.content-block.oneline-block.files-changed
%strong
.resolved-count
{{resolvedCount}}
...
...
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