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
38ed05f6
Commit
38ed05f6
authored
Feb 22, 2018
by
Constance Okoghenun
Committed by
Jacob Schatz
Feb 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged CE boards-bundle-refactor into EE
parent
440fc56b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
5 deletions
+7
-5
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+2
-2
app/assets/javascripts/pages/projects/boards/index.js
app/assets/javascripts/pages/projects/boards/index.js
+2
-0
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+3
-1
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+0
-1
No files found.
app/assets/javascripts/boards/
boards_bundle
.js
→
app/assets/javascripts/boards/
index
.js
View file @
38ed05f6
...
...
@@ -30,7 +30,7 @@ import collapseIcon from './icons/fullscreen_collapse.svg';
import
expandIcon
from
'
./icons/fullscreen_expand.svg
'
;
import
tooltip
from
'
../vue_shared/directives/tooltip
'
;
$
(
()
=>
{
export
default
()
=>
{
const
$boardApp
=
document
.
getElementById
(
'
board-app
'
);
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
const
ModalStore
=
gl
.
issueBoards
.
ModalStore
;
...
...
@@ -366,4 +366,4 @@ $(() => {
'
boards-selector
'
:
gl
.
issueBoards
.
BoardsSelector
,
}
});
}
)
;
};
app/assets/javascripts/pages/projects/boards/index.js
View file @
38ed05f6
import
UsersSelect
from
'
~/users_select
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
initBoards
from
'
~/boards
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
UsersSelect
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
initBoards
();
});
app/views/shared/boards/_show.html.haml
View file @
38ed05f6
...
...
@@ -8,7 +8,6 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'boards'
%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
...
...
config/webpack.config.js
View file @
38ed05f6
...
...
@@ -56,7 +56,9 @@ var config = {
entry
:
{
balsamiq_viewer
:
'
./blob/balsamiq_viewer.js
'
,
blob
:
'
./blob_edit/blob_bundle.js
'
,
boards
:
'
./boards/boards_bundle.js
'
,
burndown_chart
:
'
./burndown_chart/index.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
cycle_analytics
:
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
commit_pipelines
:
'
./commit/pipelines/pipelines_bundle.js
'
,
deploy_keys
:
'
./deploy_keys/index.js
'
,
...
...
spec/javascripts/test_bundle.js
View file @
38ed05f6
...
...
@@ -112,7 +112,6 @@ if (process.env.BABEL_ENV === 'coverage') {
// exempt these files from the coverage report
const
troubleMakers
=
[
'
./blob_edit/blob_bundle.js
'
,
'
./boards/boards_bundle.js
'
,
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
'
./cycle_analytics/components/stage_plan_component.js
'
,
'
./cycle_analytics/components/stage_staging_component.js
'
,
...
...
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