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
2b43cc91
Commit
2b43cc91
authored
Jan 24, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EE port of groups-webpack-bundle
parent
d41a8297
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
25 additions
and
21 deletions
+25
-21
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+4
-0
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+2
-2
app/assets/javascripts/groups/service/groups_service.js
app/assets/javascripts/groups/service/groups_service.js
+1
-3
app/assets/javascripts/pages/dashboard/groups/index/index.js
app/assets/javascripts/pages/dashboard/groups/index/index.js
+5
-0
app/assets/javascripts/pages/explore/groups/index.js
app/assets/javascripts/pages/explore/groups/index.js
+2
-0
app/assets/javascripts/pages/groups/show/index.js
app/assets/javascripts/pages/groups/show/index.js
+3
-0
app/views/dashboard/groups/_groups.html.haml
app/views/dashboard/groups/_groups.html.haml
+2
-0
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+0
-3
app/views/explore/groups/_groups.html.haml
app/views/explore/groups/_groups.html.haml
+2
-0
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+0
-3
app/views/groups/_children.html.haml
app/views/groups/_children.html.haml
+2
-3
app/views/shared/_group_form.html.haml
app/views/shared/_group_form.html.haml
+0
-2
config/webpack.config.js
config/webpack.config.js
+2
-5
No files found.
app/assets/javascripts/dispatcher.js
View file @
2b43cc91
...
...
@@ -597,6 +597,10 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
dashboard:groups:index
'
:
import
(
'
./pages/dashboard/groups/index
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
case
'
admin:licenses:new
'
:
import
(
/* webpackChunkName: "admin_licenses" */
'
ee/pages/admin/licenses/new
'
).
then
(
m
=>
m
.
default
()).
catch
(
fail
);
break
;
...
...
app/assets/javascripts/groups/index.js
View file @
2b43cc91
...
...
@@ -10,7 +10,7 @@ import groupItemComponent from './components/group_item.vue';
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-groups-tree
'
);
// Don't do anything if element doesn't exist (No groups)
...
...
@@ -71,4 +71,4 @@ document.addEventListener('DOMContentLoaded', () => {
});
},
});
}
)
;
};
app/assets/javascripts/groups/service/groups_service.js
View file @
2b43cc91
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
Vue
.
use
(
VueResource
);
import
'
../../vue_shared/vue_resource_interceptor
'
;
export
default
class
GroupsService
{
constructor
(
endpoint
)
{
...
...
app/assets/javascripts/pages/dashboard/groups/index/index.js
0 → 100644
View file @
2b43cc91
import
initGroupsList
from
'
../../../../groups
'
;
export
default
()
=>
{
initGroupsList
();
};
app/assets/javascripts/pages/explore/groups/index.js
View file @
2b43cc91
import
GroupsList
from
'
~/groups_list
'
;
import
Landing
from
'
~/landing
'
;
import
initGroupsList
from
'
../../../groups
'
;
export
default
function
()
{
new
GroupsList
();
// eslint-disable-line no-new
initGroupsList
();
const
landingElement
=
document
.
querySelector
(
'
.js-explore-groups-landing
'
);
if
(
!
landingElement
)
return
;
const
exploreGroupsLanding
=
new
Landing
(
...
...
app/assets/javascripts/pages/groups/show/index.js
View file @
2b43cc91
...
...
@@ -5,6 +5,7 @@ import notificationsDropdown from '~/notifications_dropdown';
import
NotificationsForm
from
'
~/notifications_form
'
;
import
ProjectsList
from
'
~/projects_list
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
initGroupsList
from
'
../../../groups
'
;
export
default
()
=>
{
const
newGroupChildWrapper
=
document
.
querySelector
(
'
.js-new-project-subgroup
'
);
...
...
@@ -16,4 +17,6 @@ export default () => {
if
(
newGroupChildWrapper
)
{
new
NewGroupChild
(
newGroupChildWrapper
);
}
initGroupsList
();
};
app/views/dashboard/groups/_groups.html.haml
View file @
2b43cc91
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
dashboard_groups_path
(
format: :json
),
path:
dashboard_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
app/views/dashboard/groups/index.html.haml
View file @
2b43cc91
...
...
@@ -3,9 +3,6 @@
-
header_title
"Groups"
,
dashboard_groups_path
=
render
'dashboard/groups_head'
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
-
if
params
[
:filter
].
blank?
&&
@groups
.
empty?
=
render
'shared/groups/empty_state'
-
else
...
...
app/views/explore/groups/_groups.html.haml
View file @
2b43cc91
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
explore_groups_path
(
format: :json
),
path:
explore_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
app/views/explore/groups/index.html.haml
View file @
2b43cc91
...
...
@@ -2,9 +2,6 @@
-
page_title
"Groups"
-
header_title
"Groups"
,
dashboard_groups_path
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
-
if
current_user
=
render
'dashboard/groups_head'
-
else
...
...
app/views/groups/_children.html.haml
View file @
2b43cc91
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'false'
,
group_id:
group
.
id
,
endpoint:
group_children_path
(
group
,
format: :json
),
path:
group_path
(
group
),
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
app/views/shared/_group_form.html.haml
View file @
2b43cc91
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'group'
)
-
parent
=
@group
.
parent
-
group_path
=
root_url
-
group_path
<<
parent
.
full_path
+
'/'
if
parent
...
...
config/webpack.config.js
View file @
2b43cc91
...
...
@@ -49,9 +49,6 @@ var config = {
graphs
:
'
./graphs/graphs_bundle.js
'
,
graphs_charts
:
'
./graphs/graphs_charts.js
'
,
graphs_show
:
'
./graphs/graphs_show.js
'
,
group
:
'
./group.js
'
,
groups
:
'
./groups/index.js
'
,
groups_list
:
'
./groups_list.js
'
,
help
:
'
./help/help.js
'
,
issuable
:
'
./issuable/issuable_bundle.js
'
,
issues
:
'
./issues/issues_bundle.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