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
948b4828
Commit
948b4828
authored
Nov 09, 2016
by
Phil Hughes
Committed by
Fatih Acet
Nov 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue board spec fixes
parent
a9349f57
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+2
-0
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
...ts/javascripts/diff_notes/components/resolve_count.js.es6
+1
-1
spec/features/boards/new_issue_spec.rb
spec/features/boards/new_issue_spec.rb
+1
-1
No files found.
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
948b4828
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
const list = new List(listObj);
const list = new List(listObj);
this.state.lists.push(list);
this.state.lists.push(list);
this.state.lists = _.sortBy(this.state.lists, 'position');
return list;
return list;
},
},
new (listObj) {
new (listObj) {
...
...
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
View file @
948b4828
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
return this.resolvedDiscussionCount === this.discussionCount;
return this.resolvedDiscussionCount === this.discussionCount;
},
},
resolvedCountText() {
resolvedCountText() {
return this.discussionCount ===
0
? 'discussion' : 'discussions';
return this.discussionCount ===
1
? 'discussion' : 'discussions';
}
}
}
}
});
});
...
...
spec/features/boards/new_issue_spec.rb
View file @
948b4828
...
@@ -46,7 +46,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
...
@@ -46,7 +46,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
click_button
'Cancel'
click_button
'Cancel'
expect
(
page
).
to
have_selector
(
'.board-new-issue-form'
,
visible:
false
)
expect
(
page
).
not_to
have_selector
(
'.board-new-issue-form'
)
end
end
end
end
...
...
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