BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
48fab195
Commit
48fab195
authored
Jan 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dispatcher-project-branches' into 'master'
Refactor dispatcher project branches path See merge request gitlab-org/gitlab-ce!16398
parents
de7d477d
6fcef535
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-4
index.js
...assets/javascripts/pages/projects/branches/index/index.js
+7
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
48fab195
...
...
@@ -30,7 +30,6 @@ import CommitsList from './commits';
import
Issue
from
'./issue'
;
import
BindInOut
from
'./behaviors/bind_in_out'
;
import
SecretValues
from
'./behaviors/secret_values'
;
import
DeleteModal
from
'./branches/branches_delete_modal'
;
import
Group
from
'./group'
;
import
ProjectsList
from
'./projects_list'
;
import
setupProjectEdit
from
'./project_edit'
;
...
...
@@ -55,7 +54,6 @@ 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
AjaxLoadingSpinner
from
'./ajax_loading_spinner'
;
import
GlFieldErrors
from
'./gl_field_errors'
;
import
GLForm
from
'./gl_form'
;
import
Shortcuts
from
'./shortcuts'
;
...
...
@@ -218,8 +216,9 @@ import Activities from './activities';
new
NewBranchForm
(
$
(
'.js-create-branch-form'
),
JSON
.
parse
(
document
.
getElementById
(
'availableRefs'
).
innerHTML
));
break
;
case
'projects:branches:index'
:
AjaxLoadingSpinner
.
init
();
new
DeleteModal
();
import
(
'./pages/projects/branches/index'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'projects:issues:new'
:
case
'projects:issues:edit'
:
...
...
app/assets/javascripts/pages/projects/branches/index/index.js
0 → 100644
View file @
48fab195
import
AjaxLoadingSpinner
from
'~/ajax_loading_spinner'
;
import
DeleteModal
from
'~/branches/branches_delete_modal'
;
export
default
()
=>
{
AjaxLoadingSpinner
.
init
();
new
DeleteModal
();
// eslint-disable-line no-new
};
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