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
ec918846
Commit
ec918846
authored
Mar 01, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed some files being moved incorrectly
parent
f58a6162
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
24 additions
and
26 deletions
+24
-26
ee/app/assets/javascripts/ide/components/commit_sidebar/list.vue
...assets/javascripts/ide/components/commit_sidebar/list.vue
+1
-1
ee/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
...ascripts/ide/components/commit_sidebar/list_collapsed.vue
+1
-1
ee/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
...s/javascripts/ide/components/commit_sidebar/list_item.vue
+2
-2
ee/app/assets/javascripts/ide/components/new_dropdown/index.vue
.../assets/javascripts/ide/components/new_dropdown/index.vue
+1
-1
ee/app/assets/javascripts/ide/components/new_dropdown/modal.vue
.../assets/javascripts/ide/components/new_dropdown/modal.vue
+2
-2
ee/app/assets/javascripts/ide/ide_router.js
ee/app/assets/javascripts/ide/ide_router.js
+1
-1
ee/app/assets/javascripts/ide/index.js
ee/app/assets/javascripts/ide/index.js
+1
-3
ee/app/assets/javascripts/ide/monaco_loader.js
ee/app/assets/javascripts/ide/monaco_loader.js
+0
-0
ee/app/assets/javascripts/ide/services/index.js
ee/app/assets/javascripts/ide/services/index.js
+1
-1
ee/app/assets/javascripts/ide/stores/actions/branch.js
ee/app/assets/javascripts/ide/stores/actions/branch.js
+1
-1
ee/app/assets/javascripts/ide/stores/actions/file.js
ee/app/assets/javascripts/ide/stores/actions/file.js
+2
-2
ee/app/assets/javascripts/ide/stores/actions/project.js
ee/app/assets/javascripts/ide/stores/actions/project.js
+1
-1
ee/app/assets/javascripts/ide/stores/actions/tree.js
ee/app/assets/javascripts/ide/stores/actions/tree.js
+3
-3
ee/app/assets/javascripts/ide/stores/modules/commit/actions.js
...p/assets/javascripts/ide/stores/modules/commit/actions.js
+4
-4
spec/javascripts/ide/components/commit_sidebar/actions_spec.js
...javascripts/ide/components/commit_sidebar/actions_spec.js
+1
-1
spec/javascripts/ide/components/commit_sidebar/radio_group_spec.js
...scripts/ide/components/commit_sidebar/radio_group_spec.js
+1
-1
spec/javascripts/ide/stores/modules/commit/actions_spec.js
spec/javascripts/ide/stores/modules/commit/actions_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/ide/components/commit_sidebar/list.vue
View file @
ec918846
<
script
>
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
import
icon
from
'
../../..
/vue_shared/components/icon.vue
'
;
import
icon
from
'
~
/vue_shared/components/icon.vue
'
;
import
listItem
from
'
./list_item.vue
'
;
import
listItem
from
'
./list_item.vue
'
;
import
listCollapsed
from
'
./list_collapsed.vue
'
;
import
listCollapsed
from
'
./list_collapsed.vue
'
;
...
...
ee/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
View file @
ec918846
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
icon
from
'
../../..
/vue_shared/components/icon.vue
'
;
import
icon
from
'
~
/vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
ee/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
View file @
ec918846
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
router
from
'
~
/ide/ide_router
'
;
import
router
from
'
ee
/ide/ide_router
'
;
import
icon
from
'
../../..
/vue_shared/components/icon.vue
'
;
import
icon
from
'
~
/vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
ee/app/assets/javascripts/ide/components/new_dropdown/index.vue
View file @
ec918846
<
script
>
<
script
>
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
newModal
from
'
./modal.vue
'
;
import
newModal
from
'
./modal.vue
'
;
import
upload
from
'
./upload.vue
'
;
import
upload
from
'
./upload.vue
'
;
import
icon
from
'
../../../vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
ee/app/assets/javascripts/ide/components/new_dropdown/modal.vue
View file @
ec918846
<
script
>
<
script
>
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
__
}
from
'
../../..
/locale
'
;
import
{
__
}
from
'
~
/locale
'
;
import
modal
from
'
../../..
/vue_shared/components/modal.vue
'
;
import
modal
from
'
~
/vue_shared/components/modal.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
ee/app/assets/javascripts/ide/
components/
ide_router.js
→
ee/app/assets/javascripts/ide/ide_router.js
View file @
ec918846
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
VueRouter
from
'
vue-router
'
;
import
VueRouter
from
'
vue-router
'
;
import
flash
from
'
~/flash
'
;
import
store
from
'
./stores
'
;
import
store
from
'
./stores
'
;
import
flash
from
'
../flash
'
;
import
{
import
{
getTreeEntry
,
getTreeEntry
,
}
from
'
./stores/utils
'
;
}
from
'
./stores/utils
'
;
...
...
ee/app/assets/javascripts/ide/
components/
index.js
→
ee/app/assets/javascripts/ide/index.js
View file @
ec918846
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
ide
from
'
./components/ide.vue
'
;
import
ide
from
'
./components/ide.vue
'
;
import
store
from
'
./stores
'
;
import
store
from
'
./stores
'
;
import
router
from
'
./ide_router
'
;
import
router
from
'
./ide_router
'
;
import
Translate
from
'
../vue_shared/translate
'
;
function
initIde
(
el
)
{
function
initIde
(
el
)
{
if
(
!
el
)
return
null
;
if
(
!
el
)
return
null
;
...
@@ -18,8 +18,6 @@ function initIde(el) {
...
@@ -18,8 +18,6 @@ function initIde(el) {
return
createElement
(
'
ide
'
,
{
return
createElement
(
'
ide
'
,
{
props
:
{
props
:
{
emptyStateSvgPath
:
el
.
dataset
.
emptyStateSvgPath
,
emptyStateSvgPath
:
el
.
dataset
.
emptyStateSvgPath
,
noChangesStateSvgPath
:
el
.
dataset
.
noChangesStateSvgPath
,
committedStateSvgPath
:
el
.
dataset
.
committedStateSvgPath
,
},
},
});
});
},
},
...
...
ee/app/assets/javascripts/ide/
lib/
monaco_loader.js
→
ee/app/assets/javascripts/ide/monaco_loader.js
View file @
ec918846
File moved
ee/app/assets/javascripts/ide/
lib/
services/index.js
→
ee/app/assets/javascripts/ide/services/index.js
View file @
ec918846
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
import
VueResource
from
'
vue-resource
'
;
import
Api
from
'
../..
/api
'
;
import
Api
from
'
~
/api
'
;
Vue
.
use
(
VueResource
);
Vue
.
use
(
VueResource
);
...
...
ee/app/assets/javascripts/ide/stores/actions/branch.js
View file @
ec918846
import
flash
from
'
~/flash
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
import
flash
from
'
../../../flash
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
*
as
types
from
'
../mutation_types
'
;
export
const
getBranchData
=
(
export
const
getBranchData
=
(
...
...
ee/app/assets/javascripts/ide/stores/actions/file.js
View file @
ec918846
import
{
normalizeHeaders
}
from
'
../../..
/lib/utils/common_utils
'
;
import
{
normalizeHeaders
}
from
'
~
/lib/utils/common_utils
'
;
import
flash
from
'
../../..
/flash
'
;
import
flash
from
'
~
/flash
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
router
from
'
../../ide_router
'
;
import
router
from
'
../../ide_router
'
;
...
...
ee/app/assets/javascripts/ide/stores/actions/project.js
View file @
ec918846
import
flash
from
'
~/flash
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
import
flash
from
'
../../../flash
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
*
as
types
from
'
../mutation_types
'
;
// eslint-disable-next-line import/prefer-default-export
// eslint-disable-next-line import/prefer-default-export
...
...
ee/app/assets/javascripts/ide/stores/actions/tree.js
View file @
ec918846
import
{
visitUrl
}
from
'
../../..
/lib/utils/url_utility
'
;
import
{
visitUrl
}
from
'
~
/lib/utils/url_utility
'
;
import
{
normalizeHeaders
}
from
'
../../..
/lib/utils/common_utils
'
;
import
{
normalizeHeaders
}
from
'
~
/lib/utils/common_utils
'
;
import
flash
from
'
../../..
/flash
'
;
import
flash
from
'
~
/flash
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
*
as
types
from
'
../mutation_types
'
;
import
router
from
'
../../ide_router
'
;
import
router
from
'
../../ide_router
'
;
...
...
ee/app/assets/javascripts/ide/stores/modules/commit/actions.js
View file @
ec918846
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
*
as
rootTypes
from
'
~
/ide/stores/mutation_types
'
;
import
*
as
rootTypes
from
'
ee
/ide/stores/mutation_types
'
;
import
{
createCommitPayload
,
createNewMergeRequestUrl
}
from
'
~
/ide/stores/utils
'
;
import
{
createCommitPayload
,
createNewMergeRequestUrl
}
from
'
ee
/ide/stores/utils
'
;
import
router
from
'
~
/ide/ide_router
'
;
import
router
from
'
ee
/ide/ide_router
'
;
import
service
from
'
~
/ide/services
'
;
import
service
from
'
ee
/ide/services
'
;
import
flash
from
'
~/flash
'
;
import
flash
from
'
~/flash
'
;
import
{
stripHtml
}
from
'
~/lib/utils/text_utility
'
;
import
{
stripHtml
}
from
'
~/lib/utils/text_utility
'
;
import
*
as
types
from
'
./mutation_types
'
;
import
*
as
types
from
'
./mutation_types
'
;
...
...
spec/javascripts/ide/components/commit_sidebar/actions_spec.js
View file @
ec918846
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
store
from
'
ee/ide/stores
'
;
import
store
from
'
ee/ide/stores
'
;
import
commitActions
from
'
ee/ide/components/commit_sidebar/actions.vue
'
;
import
commitActions
from
'
ee/ide/components/commit_sidebar/actions.vue
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
spec/
repo
/helpers
'
;
import
{
resetStore
}
from
'
spec/
ide
/helpers
'
;
describe
(
'
IDE commit sidebar actions
'
,
()
=>
{
describe
(
'
IDE commit sidebar actions
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/ide/components/commit_sidebar/radio_group_spec.js
View file @
ec918846
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
store
from
'
ee/ide/stores
'
;
import
store
from
'
ee/ide/stores
'
;
import
radioGroup
from
'
ee/ide/components/commit_sidebar/radio_group.vue
'
;
import
radioGroup
from
'
ee/ide/components/commit_sidebar/radio_group.vue
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
spec/
repo
/helpers
'
;
import
{
resetStore
}
from
'
spec/
ide
/helpers
'
;
describe
(
'
IDE commit sidebar radio group
'
,
()
=>
{
describe
(
'
IDE commit sidebar radio group
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/ide/stores/modules/commit/actions_spec.js
View file @
ec918846
...
@@ -4,7 +4,7 @@ import router from 'ee/ide/ide_router';
...
@@ -4,7 +4,7 @@ import router from 'ee/ide/ide_router';
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
eventHub
from
'
ee/ide/eventhub
'
;
import
eventHub
from
'
ee/ide/eventhub
'
;
import
*
as
consts
from
'
ee/ide/stores/modules/commit/constants
'
;
import
*
as
consts
from
'
ee/ide/stores/modules/commit/constants
'
;
import
{
resetStore
,
file
}
from
'
spec/
repo
/helpers
'
;
import
{
resetStore
,
file
}
from
'
spec/
ide
/helpers
'
;
describe
(
'
IDE commit module actions
'
,
()
=>
{
describe
(
'
IDE commit module actions
'
,
()
=>
{
afterEach
(()
=>
{
afterEach
(()
=>
{
...
...
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