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
655510ec
Commit
655510ec
authored
Jul 27, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed haml lint
parent
85582b05
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+6
-0
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-0
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
+4
-2
No files found.
app/assets/javascripts/gl_dropdown.js
View file @
655510ec
...
@@ -731,9 +731,15 @@ GitLabDropdown = (function() {
...
@@ -731,9 +731,15 @@ GitLabDropdown = (function() {
GitLabDropdown
.
prototype
.
focusTextInput
=
function
(
triggerFocus
=
false
)
{
GitLabDropdown
.
prototype
.
focusTextInput
=
function
(
triggerFocus
=
false
)
{
if
(
this
.
options
.
filterable
)
{
if
(
this
.
options
.
filterable
)
{
this
.
dropdown
.
one
(
'
transitionend
'
,
()
=>
{
this
.
dropdown
.
one
(
'
transitionend
'
,
()
=>
{
const
initialScrollTop
=
$
(
window
).
scrollTop
();
if
(
this
.
dropdown
.
is
(
'
.open
'
))
{
if
(
this
.
dropdown
.
is
(
'
.open
'
))
{
this
.
filterInput
.
focus
();
this
.
filterInput
.
focus
();
}
}
if
(
$
(
window
).
scrollTop
()
<
initialScrollTop
)
{
$
(
window
).
scrollTop
(
initialScrollTop
);
}
});
});
if
(
triggerFocus
)
{
if
(
triggerFocus
)
{
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
655510ec
...
@@ -574,6 +574,7 @@
...
@@ -574,6 +574,7 @@
.dropdown-input-field
,
.dropdown-input-field
,
.default-dropdown-input
{
.default-dropdown-input
{
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
30px
;
min-height
:
30px
;
padding
:
0
7px
;
padding
:
0
7px
;
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
655510ec
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
can_create_note
=
!
@diff_notes_disabled
&&
can?
(
current_user
,
:create_note
,
diffs
.
project
)
-
can_create_note
=
!
@diff_notes_disabled
&&
can?
(
current_user
,
:create_note
,
diffs
.
project
)
-
diff_files
=
diffs
.
diff_files
-
diff_files
=
diffs
.
diff_files
.content-block.oneline-block.files-changed
.content-block.oneline-block.files-changed
.diff-files-changed.js-diff-files-changed
.inline-parallel-buttons
.inline-parallel-buttons
-
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'
...
...
app/views/projects/diffs/_stats.html.haml
View file @
655510ec
...
@@ -20,5 +20,7 @@
...
@@ -20,5 +20,7 @@
=
icon
(
"
#{
diff_file_changed_icon
(
diff_file
)
}
fw"
,
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
append-right-5"
)
=
icon
(
"
#{
diff_file_changed_icon
(
diff_file
)
}
fw"
,
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
append-right-5"
)
%span
.diff-file-changes-path
=
diff_file
.
new_path
%span
.diff-file-changes-path
=
diff_file
.
new_path
.pull-right
.pull-right
%span
.cgreen
=
"+
#{
added_lines
}
"
%span
.cgreen
<
%span
.cred
=
"-
#{
removed_lines
}
"
+
#{
added_lines
}
%span
.cred
<
\
-
#{
removed_lines
}
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