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
cb13c6b7
Commit
cb13c6b7
authored
May 10, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensure filtered_search utilizes common_vue bundle
parent
40c74cca
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+3
-3
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+3
-2
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+2
-1
config/webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/views/projects/boards/_show.html.haml
View file @
cb13c6b7
...
@@ -4,9 +4,9 @@
...
@@ -4,9 +4,9 @@
-
page_title
"Boards"
-
page_title
"Boards"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
'common_vue'
=
page_specific_javascript_bundle_tag
(
'filtered_search'
)
=
webpack_bundle_tag
'filtered_search'
=
page_specific_javascript_bundle_tag
(
'boards'
)
=
webpack_bundle_tag
'boards'
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"projects/boards/components/board"
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"projects/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/projects/issues/index.html.haml
View file @
cb13c6b7
...
@@ -7,8 +7,9 @@
...
@@ -7,8 +7,9 @@
=
render
"projects/issues/head"
=
render
"projects/issues/head"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'filtered_search'
)
=
webpack_bundle_tag
'common_vue'
=
page_specific_javascript_bundle_tag
(
'issues'
)
=
webpack_bundle_tag
'filtered_search'
=
webpack_bundle_tag
'issues'
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@project
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@project
.
name
}
issues"
)
...
...
app/views/projects/merge_requests/index.html.haml
View file @
cb13c6b7
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
=
render
'projects/last_push'
=
render
'projects/last_push'
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'filtered_search'
)
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'filtered_search'
-
if
@project
.
merge_requests
.
exists?
-
if
@project
.
merge_requests
.
exists?
%div
{
class:
container_class
}
%div
{
class:
container_class
}
...
...
config/webpack.config.js
View file @
cb13c6b7
...
@@ -140,6 +140,7 @@ var config = {
...
@@ -140,6 +140,7 @@ var config = {
'
diff_notes
'
,
'
diff_notes
'
,
'
environments
'
,
'
environments
'
,
'
environments_folder
'
,
'
environments_folder
'
,
'
filtered_search
'
,
'
sidebar
'
,
'
sidebar
'
,
'
issue_show
'
,
'
issue_show
'
,
'
merge_conflicts
'
,
'
merge_conflicts
'
,
...
...
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