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
Boxiang Sun
gitlab-ce
Commits
c2a9e6ea
Commit
c2a9e6ea
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0145e8ea
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+1
-1
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+2
-2
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+1
-1
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
c2a9e6ea
...
...
@@ -136,7 +136,7 @@ $kbd-bg: #333;
//== Buttons
//
//##
$btn-default-color
:
#7f8fa4
;
$btn-default-color
:
$gl-text-color
;
$btn-default-bg
:
#fff
;
$btn-default-border
:
#e7e9ed
;
...
...
This diff is collapsed.
Click to expand it.
app/helpers/diff_helper.rb
View file @
c2a9e6ea
...
...
@@ -137,7 +137,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"
commit-diff-viewtype
"
,
class:
(
params
[
:view
]
!=
'parallel'
?
'btn btn-sm active'
:
'btn btn-sm'
)
do
link_to
url_for
(
params_copy
),
id:
"
inline-diff-btn
"
,
class:
(
params
[
:view
]
!=
'parallel'
?
'btn btn-sm active'
:
'btn btn-sm'
)
do
'Inline'
end
end
...
...
@@ -148,7 +148,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"
commit-diff-viewtype
"
,
class:
(
params
[
:view
]
==
'parallel'
?
'btn active btn-sm'
:
'btn btn-sm'
)
do
link_to
url_for
(
params_copy
),
id:
"
parallel-diff-btn
"
,
class:
(
params
[
:view
]
==
'parallel'
?
'btn active btn-sm'
:
'btn btn-sm'
)
do
'Side-by-side'
end
end
...
...
This diff is collapsed.
Click to expand it.
features/steps/project/merge_requests.rb
View file @
c2a9e6ea
...
...
@@ -225,13 +225,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I click link "Hide inline discussion" of the second file'
do
page
.
within
'.files [id^=diff]:nth-child(2)'
do
find
(
'.js-toggle-diff-comments'
).
click
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
end
end
step
'I click link "Show inline discussion" of the second file'
do
page
.
within
'.files [id^=diff]:nth-child(2)'
do
find
(
'.js-toggle-diff-comments'
).
click
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
end
end
...
...
This diff is collapsed.
Click to expand it.
features/steps/shared/diff_note.rb
View file @
c2a9e6ea
...
...
@@ -198,7 +198,7 @@ module SharedDiffNote
end
step
'I click side-by-side diff button'
do
click_link
"Side-by-side"
find
(
'#parallel-diff-btn'
).
trigger
(
'click'
)
end
step
'I see side-by-side diff button'
do
...
...
This diff is collapsed.
Click to expand it.
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