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
8b116ce1
Commit
8b116ce1
authored
Nov 06, 2020
by
Justin Mandell
Committed by
Vitaly Slobodin
Nov 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace LoadingButton in IDE commit_sidebar/form.vue with GlButton
parent
a414c3f5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
15 deletions
+17
-15
app/assets/javascripts/ide/components/commit_sidebar/form.vue
...assets/javascripts/ide/components/commit_sidebar/form.vue
+16
-10
spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
...ojects/blobs/user_creates_new_blob_in_new_project_spec.rb
+0
-2
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
...sees_link_to_create_license_file_in_empty_project_spec.rb
+1
-3
No files found.
app/assets/javascripts/ide/components/commit_sidebar/form.vue
View file @
8b116ce1
<
script
>
import
{
mapState
,
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
GlModal
,
GlSafeHtmlDirective
}
from
'
@gitlab/ui
'
;
import
{
GlModal
,
GlSafeHtmlDirective
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
n__
,
__
}
from
'
~/locale
'
;
import
LoadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
CommitMessageField
from
'
./message_field.vue
'
;
import
Actions
from
'
./actions.vue
'
;
import
SuccessMessage
from
'
./success_message.vue
'
;
...
...
@@ -12,10 +11,10 @@ import { createUnexpectedCommitError } from '../../lib/errors';
export
default
{
components
:
{
Actions
,
LoadingButton
,
CommitMessageField
,
SuccessMessage
,
GlModal
,
GlButton
,
},
directives
:
{
SafeHtml
:
GlSafeHtmlDirective
,
...
...
@@ -156,12 +155,16 @@ export default {
/>
<div
class=
"clearfix gl-mt-5"
>
<actions
/>
<
loading
-button
<
gl
-button
:loading=
"submitCommitLoading"
:label=
"commitButtonText"
container-class=
"btn btn-success btn-sm float-left qa-commit-button"
class=
"float-left qa-commit-button"
size=
"small"
category=
"primary"
variant=
"success"
@
click=
"commit"
/>
>
{{
__
(
'
Commit
'
)
}}
</gl-button>
<button
v-if=
"!discardDraftButtonDisabled"
type=
"button"
...
...
@@ -170,14 +173,17 @@ export default {
>
{{
__
(
'
Discard draft
'
)
}}
</button>
<button
<
gl-
button
v-else
type=
"button"
class=
"btn btn-default btn-sm float-right"
class=
"float-right"
category=
"secondary"
variant=
"default"
size=
"small"
@
click=
"toggleIsCompact"
>
{{
__
(
'
Collapse
'
)
}}
</button>
</
gl-
button>
</div>
<gl-modal
ref=
"commitErrorModal"
...
...
spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
View file @
8b116ce1
...
...
@@ -23,8 +23,6 @@ RSpec.describe 'User creates new blob', :js do
ide_commit
click_button
(
'Commit'
)
expect
(
page
).
to
have_content
(
'All changes are committed'
)
expect
(
project
.
repository
.
blob_at
(
'master'
,
'dummy-file'
).
data
).
to
eql
(
"Hello world
\n
"
)
end
...
...
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
View file @
8b116ce1
...
...
@@ -27,9 +27,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
ide_commit
click_button
(
'Commit'
)
expect
(
current_path
).
to
eq
(
"/-/ide/project/
#{
project
.
full_path
}
/tree/master/-/"
)
expect
(
current_path
).
to
eq
(
"/-/ide/project/
#{
project
.
full_path
}
/tree/master/-/LICENSE/"
)
expect
(
page
).
to
have_content
(
'All changes are committed'
)
...
...
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