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
433ad2d0
Commit
433ad2d0
authored
Jun 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
karma fixes
parent
0531631c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+1
-1
spec/javascripts/ide/components/commit_sidebar/form_spec.js
spec/javascripts/ide/components/commit_sidebar/form_spec.js
+1
-0
spec/javascripts/ide/components/commit_sidebar/message_field_spec.js
...ripts/ide/components/commit_sidebar/message_field_spec.js
+1
-0
spec/javascripts/ide/mock_data.js
spec/javascripts/ide/mock_data.js
+1
-0
spec/javascripts/ide/stores/getters_spec.js
spec/javascripts/ide/stores/getters_spec.js
+3
-7
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
433ad2d0
...
@@ -49,8 +49,8 @@ export default {
...
@@ -49,8 +49,8 @@ export default {
:title=
"$options.currentBranchPermissionsTooltip"
:title=
"$options.currentBranchPermissionsTooltip"
>
>
<span
<span
v-html=
"commitToCurrentBranchText"
class=
"ide-radio-label"
class=
"ide-radio-label"
v-html=
"commitToCurrentBranchText"
>
>
</span>
</span>
</radio-group>
</radio-group>
...
...
spec/javascripts/ide/components/commit_sidebar/form_spec.js
View file @
433ad2d0
...
@@ -16,6 +16,7 @@ describe('IDE commit form', () => {
...
@@ -16,6 +16,7 @@ describe('IDE commit form', () => {
store
.
state
.
changedFiles
.
push
(
'
test
'
);
store
.
state
.
changedFiles
.
push
(
'
test
'
);
store
.
state
.
currentProjectId
=
'
abcproject
'
;
store
.
state
.
currentProjectId
=
'
abcproject
'
;
store
.
state
.
currentBranchId
=
'
master
'
;
Vue
.
set
(
store
.
state
.
projects
,
'
abcproject
'
,
{
...
projectData
});
Vue
.
set
(
store
.
state
.
projects
,
'
abcproject
'
,
{
...
projectData
});
vm
=
createComponentWithStore
(
Component
,
store
).
$mount
();
vm
=
createComponentWithStore
(
Component
,
store
).
$mount
();
...
...
spec/javascripts/ide/components/commit_sidebar/message_field_spec.js
View file @
433ad2d0
...
@@ -13,6 +13,7 @@ describe('IDE commit message field', () => {
...
@@ -13,6 +13,7 @@ describe('IDE commit message field', () => {
Component
,
Component
,
{
{
text
:
''
,
text
:
''
,
placeholder
:
'
testing
'
,
},
},
'
#app
'
,
'
#app
'
,
);
);
...
...
spec/javascripts/ide/mock_data.js
View file @
433ad2d0
...
@@ -8,6 +8,7 @@ export const projectData = {
...
@@ -8,6 +8,7 @@ export const projectData = {
branches
:
{
branches
:
{
master
:
{
master
:
{
treeId
:
'
abcproject/master
'
,
treeId
:
'
abcproject/master
'
,
can_push
:
true
,
},
},
},
},
mergeRequests
:
{},
mergeRequests
:
{},
...
...
spec/javascripts/ide/stores/getters_spec.js
View file @
433ad2d0
...
@@ -146,15 +146,11 @@ describe('IDE store getters', () => {
...
@@ -146,15 +146,11 @@ describe('IDE store getters', () => {
it
(
'
returns the last commit of the current branch on the current project
'
,
()
=>
{
it
(
'
returns the last commit of the current branch on the current project
'
,
()
=>
{
const
commitTitle
=
'
Example commit title
'
;
const
commitTitle
=
'
Example commit title
'
;
const
localGetters
=
{
const
localGetters
=
{
currentProject
:
{
currentBranch
:
{
branches
:
{
'
example-branch
'
:
{
commit
:
{
commit
:
{
title
:
commitTitle
,
title
:
commitTitle
,
},
},
},
},
},
},
};
};
localState
.
currentBranchId
=
'
example-branch
'
;
localState
.
currentBranchId
=
'
example-branch
'
;
...
...
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