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
1cf13817
Commit
1cf13817
authored
Mar 18, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tooltip for comment toggle in diff. Add changelog item and fix tests
parent
e07d32eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
No files found.
CHANGELOG
View file @
1cf13817
...
@@ -6,6 +6,7 @@ v 7.10.0 (unreleased)
...
@@ -6,6 +6,7 @@ v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger)
- Add a service to support external wikis (Hannes Rosenögger)
- List new commits for newly pushed branch in activity view.
- List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar.
- Add changelog, license and contribution guide links to project sidebar.
- Improve diff UI
v 7.9.0 (unreleased)
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
- Add HipChat integration documentation (Stan Hu)
...
...
app/views/projects/diffs/_file.html.haml
View file @
1cf13817
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
.diff-btn-group
.diff-btn-group
-
if
blob
.
text?
-
if
blob
.
text?
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm active
'
do
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm active
has_tooltip'
,
title:
"Toggle comments for this file"
do
%i
.fa.fa-comments
%i
.fa.fa-comments
...
...
features/steps/project/merge_requests.rb
View file @
1cf13817
...
@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I click link "Hide inline discussion" of the second file'
do
step
'I click link "Hide inline discussion" of the second file'
do
within
'.files [id^=diff]:nth-child(2)'
do
within
'.files [id^=diff]:nth-child(2)'
do
click_link
'Show/Hide comments'
find
(
'.js-toggle-diff-comments'
).
click
end
end
end
end
step
'I click link "Show inline discussion" of the second file'
do
step
'I click link "Show inline discussion" of the second file'
do
within
'.files [id^=diff]:nth-child(2)'
do
within
'.files [id^=diff]:nth-child(2)'
do
click_link
'Show/Hide comments'
find
(
'.js-toggle-diff-comments'
).
click
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