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
ff24f0e4
Commit
ff24f0e4
authored
Jan 16, 2017
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HAMLLint: Fix `RubyComments` offences
parent
41f130ea
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
app/views/projects/blob/_image.html.haml
app/views/projects/blob/_image.html.haml
+2
-2
app/views/projects/diffs/_content.html.haml
app/views/projects/diffs/_content.html.haml
+1
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+3
-3
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+2
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+4
-4
No files found.
app/views/projects/blob/_image.html.haml
View file @
ff24f0e4
.file-content.image_file
-
if
blob
.
svg?
-
if
blob
.
size_within_svg_limits?
-
# We need to scrub SVG but we cannot do so in the RawController: it would
-
# be wrong/strange if RawController modified the data.
-# We need to scrub SVG but we cannot do so in the RawController: it would
-# be wrong/strange if RawController modified the data.
-
blob
.
load_all_data!
(
@repository
)
-
blob
=
sanitize_svg
(
blob
)
%img
{
src:
"data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"
,
alt:
"#{blob.name}"
}
...
...
app/views/projects/diffs/_content.html.haml
View file @
ff24f0e4
.diff-content.diff-wrap-lines
-
# Skip all non non-supported blobs
-# Skip all non non-supported blobs
-
return
unless
blob
.
respond_to?
(
:text?
)
-
if
diff_file
.
too_large?
.nothing-here-block
This diff could not be displayed because it is too large.
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
ff24f0e4
...
...
@@ -43,7 +43,7 @@
#commits
.commits.tab-pane.active
=
render
"projects/merge_requests/show/commits"
#diffs
.diffs.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
-
if
@pipelines
.
any?
#pipelines
.pipelines.tab-pane
=
render
"projects/merge_requests/show/pipelines"
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
ff24f0e4
...
...
@@ -92,11 +92,11 @@
=
render
"projects/merge_requests/discussion"
#commits
.commits.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
#pipelines
.pipelines.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
#diffs
.diffs.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
.mr-loading-status
=
spinner
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
ff24f0e4
...
...
@@ -13,8 +13,8 @@
%span
.ci-coverage
-
elsif
@merge_request
.
has_ci?
-
# Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
-
# TODO, remove in later versions when services like Jenkins will set CI status via Commit status API
-# Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
-# TODO, remove in later versions when services like Jenkins will set CI status via Commit status API
.mr-widget-heading
-
%w[success skipped canceled failed running pending]
.
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status} ci-status-icon-#{status}"
,
style:
"display:none"
}
...
...
app/views/users/show.html.haml
View file @
ff24f0e4
...
...
@@ -110,16 +110,16 @@
=
spinner
#groups
.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
#contributed
.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
#projects
.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
#snippets
.tab-pane
-
# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
.loading-status
=
spinner
...
...
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