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
68c8bba1
Commit
68c8bba1
authored
Jan 17, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed up EE specific imports
parent
a91df1c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-1
app/assets/javascripts/pages/projects/edit/index.js
app/assets/javascripts/pages/projects/edit/index.js
+8
-3
spec/javascripts/project_new_spec.js
spec/javascripts/project_new_spec.js
+1
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
68c8bba1
...
...
@@ -32,6 +32,8 @@ import initSettingsPanels from './settings_panels';
import
PerformanceBar
from
'
./performance_bar
'
;
import
initNotes
from
'
./init_notes
'
;
import
initIssuableSidebar
from
'
./init_issuable_sidebar
'
;
import
GpgBadges
from
'
./gpg_badges
'
;
import
initChangesDropdown
from
'
./init_changes_dropdown
'
;
import
NewGroupChild
from
'
./groups/new_group_child
'
;
import
{
ajaxGet
,
convertPermissionToBoolean
}
from
'
./lib/utils/common_utils
'
;
import
GlFieldErrors
from
'
./gl_field_errors
'
;
...
...
@@ -48,7 +50,6 @@ import SearchAutocomplete from './search_autocomplete';
import
Activities
from
'
./activities
'
;
// EE-only
import
ApproversSelect
from
'
ee/approvers_select
'
;
// eslint-disable-line import/first
import
initGeoInfoModal
from
'
ee/init_geo_info_modal
'
;
// eslint-disable-line import/first
import
initGroupAnalytics
from
'
ee/init_group_analytics
'
;
// eslint-disable-line import/first
import
initPathLocks
from
'
ee/path_locks
'
;
// eslint-disable-line import/first
...
...
app/assets/javascripts/pages/projects/edit/index.js
View file @
68c8bba1
/* eslint-disable no-new */
import
UsersSelect
from
'
~/users_select
'
;
import
UserCallout
from
'
~/user_callout
'
;
import
groupsSelect
from
'
~/groups_select
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
import
setupProjectEdit
from
'
~/project_edit
'
;
import
ProjectNew
from
'
../shared/project_new
'
;
import
projectAvatar
from
'
../shared/project_avatar
'
;
import
initProjectPermissionsSettings
from
'
../shared/permissions
'
;
import
UsersSelect
from
'
~/users_select
'
;
import
UserCallout
from
'
~/user_callout
'
;
import
groupsSelect
from
'
~/groups_select
'
;
// EE imports
import
ApproversSelect
from
'
ee/approvers_select
'
;
// eslint-disable-line import/first
export
default
()
=>
{
new
ProjectNew
();
// eslint-disable-line no-new
...
...
@@ -21,4 +23,7 @@ export default () => {
new
UserCallout
({
className
:
'
js-service-desk-callout
'
});
new
UserCallout
({
className
:
'
js-mr-approval-callout
'
});
// EE imports
new
ApproversSelect
();
// eslint-disable-line no-new
};
spec/javascripts/project_new_spec.js
View file @
68c8bba1
import
ProjectNew
from
'
~/project_new
'
;
import
ProjectNew
from
'
~/p
ages/projects/shared/p
roject_new
'
;
describe
(
'
ApproversSelect
'
,
function
()
{
const
projectSettingsTemplate
=
'
projects/edit.html.raw
'
;
...
...
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