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
ad532918
Commit
ad532918
authored
Feb 28, 2018
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore InlineJavaScript linter in existing script tag locations.
parent
25283e71
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
15 additions
and
0 deletions
+15
-0
app/views/projects/branches/new.html.haml
app/views/projects/branches/new.html.haml
+1
-0
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-0
app/views/projects/graphs/charts.html.haml
app/views/projects/graphs/charts.html.haml
+1
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-0
app/views/projects/pipelines/charts/_pipeline_times.haml
app/views/projects/pipelines/charts/_pipeline_times.haml
+1
-0
app/views/projects/pipelines/charts/_pipelines.haml
app/views/projects/pipelines/charts/_pipelines.haml
+1
-0
app/views/projects/pipelines/new.html.haml
app/views/projects/pipelines/new.html.haml
+1
-0
app/views/projects/tags/new.html.haml
app/views/projects/tags/new.html.haml
+1
-0
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+1
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+3
-0
app/views/shared/notes/_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+1
-0
app/views/u2f/_authenticate.html.haml
app/views/u2f/_authenticate.html.haml
+1
-0
app/views/u2f/_register.html.haml
app/views/u2f/_register.html.haml
+1
-0
No files found.
app/views/projects/branches/new.html.haml
View file @
ad532918
...
@@ -28,4 +28,5 @@
...
@@ -28,4 +28,5 @@
.form-actions
.form-actions
=
button_tag
'Create branch'
,
class:
'btn btn-create'
,
tabindex:
3
=
button_tag
'Create branch'
,
class:
'btn btn-create'
,
tabindex:
3
=
link_to
'Cancel'
,
project_branches_path
(
@project
),
class:
'btn btn-cancel'
=
link_to
'Cancel'
,
project_branches_path
(
@project
),
class:
'btn btn-cancel'
-# haml-lint:disable InlineJavaScript
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
app/views/projects/edit.html.haml
View file @
ad532918
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
Enable or disable certain project features and choose access levels.
Enable or disable certain project features and choose access levels.
.settings-content
.settings-content
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
remote:
true
,
html:
{
multipart:
true
,
class:
"sharing-permissions-form"
},
authenticity_token:
true
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
remote:
true
,
html:
{
multipart:
true
,
class:
"sharing-permissions-form"
},
authenticity_token:
true
do
|
f
|
-# haml-lint:disable InlineJavaScript
%script
.js-project-permissions-form-data
{
type:
"application/json"
}=
project_permissions_panel_data
(
@project
)
%script
.js-project-permissions-form-data
{
type:
"application/json"
}=
project_permissions_panel_data
(
@project
)
.js-project-permissions-form
.js-project-permissions-form
=
f
.
submit
'Save changes'
,
class:
"btn btn-save"
=
f
.
submit
'Save changes'
,
class:
"btn btn-save"
...
...
app/views/projects/graphs/charts.html.haml
View file @
ad532918
...
@@ -74,6 +74,7 @@
...
@@ -74,6 +74,7 @@
=
_
(
"Commits per day hour (UTC)"
)
=
_
(
"Commits per day hour (UTC)"
)
%canvas
#hour-chart
%canvas
#hour-chart
-# haml-lint:disable InlineJavaScript
%script
#projectChartData
{
type:
"application/json"
}
%script
#projectChartData
{
type:
"application/json"
}
-
projectChartData
=
{};
-
projectChartData
=
{};
-
projectChartData
[
'hour'
]
=
@commits_per_time
-
projectChartData
[
'hour'
]
=
@commits_per_time
...
...
app/views/projects/issues/show.html.haml
View file @
ad532918
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
.issue-details.issuable-details
.issue-details.issuable-details
.detail-page-description.content-block
.detail-page-description.content-block
-# haml-lint:disable InlineJavaScript
%script
#js-issuable-app-initial-data
{
type:
"application/json"
}=
issuable_initial_data
(
@issue
).
to_json
%script
#js-issuable-app-initial-data
{
type:
"application/json"
}=
issuable_initial_data
(
@issue
).
to_json
#js-issuable-app
#js-issuable-app
%h2
.title
=
markdown_field
(
@issue
,
:title
)
%h2
.title
=
markdown_field
(
@issue
,
:title
)
...
...
app/views/projects/pipelines/charts/_pipeline_times.haml
View file @
ad532918
...
@@ -4,4 +4,5 @@
...
@@ -4,4 +4,5 @@
%canvas
#build_timesChart
{
height:
200
}
%canvas
#build_timesChart
{
height:
200
}
-# haml-lint:disable InlineJavaScript
%script
#pipelinesTimesChartsData
{
type:
"application/json"
}=
{
:labels
=>
@charts
[
:pipeline_times
].
labels
,
:values
=>
@charts
[
:pipeline_times
].
pipeline_times
}.
to_json
.
html_safe
%script
#pipelinesTimesChartsData
{
type:
"application/json"
}=
{
:labels
=>
@charts
[
:pipeline_times
].
labels
,
:values
=>
@charts
[
:pipeline_times
].
pipeline_times
}.
to_json
.
html_safe
app/views/projects/pipelines/charts/_pipelines.haml
View file @
ad532918
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
=
_
(
"Pipelines for last year"
)
=
_
(
"Pipelines for last year"
)
%canvas
#yearChart
.padded
{
height:
250
}
%canvas
#yearChart
.padded
{
height:
250
}
-# haml-lint:disable InlineJavaScript
%script
#pipelinesChartsData
{
type:
"application/json"
}
%script
#pipelinesChartsData
{
type:
"application/json"
}
-
chartData
=
[]
-
chartData
=
[]
-
[
:week
,
:month
,
:year
].
each
do
|
scope
|
-
[
:week
,
:month
,
:year
].
each
do
|
scope
|
...
...
app/views/projects/pipelines/new.html.haml
View file @
ad532918
...
@@ -20,4 +20,5 @@
...
@@ -20,4 +20,5 @@
=
f
.
submit
'Create pipeline'
,
class:
'btn btn-create'
,
tabindex:
3
=
f
.
submit
'Create pipeline'
,
class:
'btn btn-create'
,
tabindex:
3
=
link_to
'Cancel'
,
project_pipelines_path
(
@project
),
class:
'btn btn-cancel'
=
link_to
'Cancel'
,
project_pipelines_path
(
@project
),
class:
'btn btn-cancel'
-# haml-lint:disable InlineJavaScript
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
app/views/projects/tags/new.html.haml
View file @
ad532918
...
@@ -43,4 +43,5 @@
...
@@ -43,4 +43,5 @@
.form-actions
.form-actions
=
button_tag
s_
(
'TagsPage|Create tag'
),
class:
'btn btn-create'
=
button_tag
s_
(
'TagsPage|Create tag'
),
class:
'btn btn-create'
=
link_to
s_
(
'TagsPage|Cancel'
),
project_tags_path
(
@project
),
class:
'btn btn-cancel'
=
link_to
s_
(
'TagsPage|Cancel'
),
project_tags_path
(
@project
),
class:
'btn btn-cancel'
-# haml-lint:disable InlineJavaScript
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
app/views/shared/boards/_show.html.haml
View file @
ad532918
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'common_vue'
-# haml-lint:disable InlineJavaScript
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"shared/boards/components/board"
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"shared/boards/components/board"
%script
#js-board-modal-filter
{
type:
"text/x-template"
}=
render
"shared/issuable/search_bar"
,
type: :boards_modal
%script
#js-board-modal-filter
{
type:
"text/x-template"
}=
render
"shared/issuable/search_bar"
,
type: :boards_modal
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
ad532918
...
@@ -117,10 +117,12 @@
...
@@ -117,10 +117,12 @@
=
render
partial:
"shared/issuable/label_page_create"
=
render
partial:
"shared/issuable/label_page_create"
-
if
issuable
.
has_attribute?
(
:confidential
)
-
if
issuable
.
has_attribute?
(
:confidential
)
-# haml-lint:disable InlineJavaScript
%script
#js-confidential-issue-data
{
type:
"application/json"
}=
{
is_confidential:
@issue
.
confidential
,
is_editable:
can_edit_issuable
}.
to_json
.
html_safe
%script
#js-confidential-issue-data
{
type:
"application/json"
}=
{
is_confidential:
@issue
.
confidential
,
is_editable:
can_edit_issuable
}.
to_json
.
html_safe
#js-confidential-entry-point
#js-confidential-entry-point
-
if
issuable
.
has_attribute?
(
:discussion_locked
)
-
if
issuable
.
has_attribute?
(
:discussion_locked
)
-# haml-lint:disable InlineJavaScript
%script
#js-lock-issue-data
{
type:
"application/json"
}=
{
is_locked:
issuable
.
discussion_locked?
,
is_editable:
can_edit_issuable
}.
to_json
.
html_safe
%script
#js-lock-issue-data
{
type:
"application/json"
}=
{
is_locked:
issuable
.
discussion_locked?
,
is_editable:
can_edit_issuable
}.
to_json
.
html_safe
#js-lock-entry-point
#js-lock-entry-point
...
@@ -157,4 +159,5 @@
...
@@ -157,4 +159,5 @@
=
_
(
'Move'
)
=
_
(
'Move'
)
=
icon
(
'spinner spin'
,
class:
'sidebar-move-issue-confirmation-loading-icon'
)
=
icon
(
'spinner spin'
,
class:
'sidebar-move-issue-confirmation-loading-icon'
)
-# haml-lint:disable InlineJavaScript
%script
.js-sidebar-options
{
type:
"application/json"
}=
issuable_sidebar_options
(
issuable
,
can_edit_issuable
).
to_json
.
html_safe
%script
.js-sidebar-options
{
type:
"application/json"
}=
issuable_sidebar_options
(
issuable
,
can_edit_issuable
).
to_json
.
html_safe
app/views/shared/notes/_notes_with_form.html.haml
View file @
ad532918
...
@@ -35,4 +35,5 @@
...
@@ -35,4 +35,5 @@
is locked. Only
is locked. Only
%b
project members
%b
project members
can comment.
can comment.
-# haml-lint:disable InlineJavaScript
%script
.js-notes-data
{
type:
"application/json"
}=
initial_notes_data
(
autocomplete
).
to_json
.
html_safe
%script
.js-notes-data
{
type:
"application/json"
}=
initial_notes_data
(
autocomplete
).
to_json
.
html_safe
app/views/u2f/_authenticate.html.haml
View file @
ad532918
#js-authenticate-u2f
#js-authenticate-u2f
%a
.btn.btn-block.btn-info
#js-login-2fa-device
{
href:
'#'
}
Sign in via 2FA code
%a
.btn.btn-block.btn-info
#js-login-2fa-device
{
href:
'#'
}
Sign in via 2FA code
-# haml-lint:disable InlineJavaScript
%script
#js-authenticate-u2f-not-supported
{
type:
"text/template"
}
%script
#js-authenticate-u2f-not-supported
{
type:
"text/template"
}
%p
Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
%p
Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
...
...
app/views/u2f/_register.html.haml
View file @
ad532918
#js-register-u2f
#js-register-u2f
-# haml-lint:disable InlineJavaScript
%script
#js-register-u2f-not-supported
{
type:
"text/template"
}
%script
#js-register-u2f-not-supported
{
type:
"text/template"
}
%p
Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
%p
Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
...
...
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