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
151ecac7
Commit
151ecac7
authored
Aug 15, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed changed files dropdown not being shown
Closes #36479
parent
de0d0e4e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+5
-1
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/diff.scss
View file @
151ecac7
...
@@ -560,9 +560,13 @@
...
@@ -560,9 +560,13 @@
}
}
.diff-files-changed
{
.diff-files-changed
{
.inline-parallel-buttons
{
position
:
relative
;
z-index
:
1
;
}
.commit-stat-summary
{
.commit-stat-summary
{
@include
new-style-dropdown
;
@include
new-style-dropdown
;
z-index
:
-1
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-left
:
-
$gl-padding
;
margin-left
:
-
$gl-padding
;
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
151ecac7
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
{
class:
(
"diff-files-changed-merge-request"
if
merge_request
)
}
.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
{
class:
(
"diff-files-changed-merge-request"
if
merge_request
)
}
.files-changed-inner
.files-changed-inner
.inline-parallel-buttons
.inline-parallel-buttons
.hidden-xs.hidden-sm
-
if
!
diffs_expanded?
&&
diff_files
.
any?
{
|
diff_file
|
diff_file
.
collapsed?
}
-
if
!
diffs_expanded?
&&
diff_files
.
any?
{
|
diff_file
|
diff_file
.
collapsed?
}
=
link_to
'Expand all'
,
url_for
(
params
.
merge
(
expanded:
1
,
format:
nil
)),
class:
'btn btn-default'
=
link_to
'Expand all'
,
url_for
(
params
.
merge
(
expanded:
1
,
format:
nil
)),
class:
'btn btn-default'
-
if
show_whitespace_toggle
-
if
show_whitespace_toggle
...
...
app/views/projects/diffs/_stats.html.haml
View file @
151ecac7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%strong
.cgreen
#{
sum_added_lines
}
additions
%strong
.cgreen
#{
sum_added_lines
}
additions
and
and
%strong
.cred
#{
sum_removed_lines
}
deletions
%strong
.cred
#{
sum_removed_lines
}
deletions
.diff-stats-additions-deletions-collapsed.pull-right
{
"aria-hidden"
:
"true"
,
"aria-describedby"
:
"diff-stats"
}
.diff-stats-additions-deletions-collapsed.pull-right
.hidden-xs.hidden-sm
{
"aria-hidden"
:
"true"
,
"aria-describedby"
:
"diff-stats"
}
%strong
.cgreen
<
%strong
.cgreen
<
+
#{
sum_added_lines
}
+
#{
sum_added_lines
}
%strong
.cred
<
%strong
.cred
<
...
...
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