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
e15295bd
Commit
e15295bd
authored
Aug 18, 2021
by
Michael Le
Committed by
Savas Vedova
Aug 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "Save" in separate row for Profile and Preference settings pages
parent
5ef9b4a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
18 deletions
+15
-18
app/assets/javascripts/profile/preferences/components/profile_preferences.vue
...ts/profile/preferences/components/profile_preferences.vue
+12
-14
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+3
-4
No files found.
app/assets/javascripts/profile/preferences/components/profile_preferences.vue
View file @
e15295bd
...
@@ -127,20 +127,18 @@ export default {
...
@@ -127,20 +127,18 @@ export default {
:config=
"$options.integrationViewConfigs[view.name]"
:config=
"$options.integrationViewConfigs[view.name]"
/>
/>
</div>
</div>
<div
class=
"col-lg-4 profile-settings-sidebar"
></div>
<div
class=
"col-sm-12"
>
<div
class=
"col-lg-8"
>
<hr
/>
<div
class=
"form-group"
>
<gl-button
<gl-button
category=
"primary"
category=
"primary"
variant=
"confirm"
variant=
"confirm"
name=
"commit"
name=
"commit"
type=
"submit"
type=
"submit"
:disabled=
"!isSubmitEnabled"
:disabled=
"!isSubmitEnabled"
:value=
"$options.i18n.saveChanges"
:value=
"$options.i18n.saveChanges"
>
>
{{
$options
.
i18n
.
saveChanges
}}
{{
$options
.
i18n
.
saveChanges
}}
</gl-button>
</gl-button>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
app/views/profiles/show.html.haml
View file @
e15295bd
...
@@ -122,10 +122,9 @@
...
@@ -122,10 +122,9 @@
=
f
.
check_box
:include_private_contributions
,
label:
s_
(
'Profiles|Include private contributions on my profile'
),
wrapper_class:
'mb-2'
,
inline:
true
=
f
.
check_box
:include_private_contributions
,
label:
s_
(
'Profiles|Include private contributions on my profile'
),
wrapper_class:
'mb-2'
,
inline:
true
.help-block
.help-block
=
s_
(
"Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information"
)
=
s_
(
"Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information"
)
.row.gl-justify-content-end.gl-mt-5
%hr
.col-lg-8.gl-display-flex
=
f
.
submit
s_
(
"Profiles|Update profile settings"
),
class:
'gl-button btn btn-confirm gl-mr-3'
=
f
.
submit
s_
(
"Profiles|Update profile settings"
),
class:
'gl-button btn btn-confirm gl-mr-3'
=
link_to
_
(
"Cancel"
),
user_path
(
current_user
),
class:
'gl-button btn btn-default btn-cancel'
=
link_to
_
(
"Cancel"
),
user_path
(
current_user
),
class:
'gl-button btn btn-default btn-cancel'
.modal.modal-profile-crop
{
data:
{
cropper_css_path:
ActionController
::
Base
.
helpers
.
stylesheet_path
(
'lazy_bundles/cropper.css'
)
}
}
.modal.modal-profile-crop
{
data:
{
cropper_css_path:
ActionController
::
Base
.
helpers
.
stylesheet_path
(
'lazy_bundles/cropper.css'
)
}
}
.modal-dialog
.modal-dialog
...
...
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