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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
803d3243
Commit
803d3243
authored
Aug 14, 2019
by
Marc Schwede
Committed by
Clement Ho
Aug 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed selection classes to harmonize with other settings
parent
b3aa0711
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+1
-0
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+4
-4
changelogs/unreleased/62286-Consistent-selection-elements-in-user-settings-preferences.yml
...stent-selection-elements-in-user-settings-preferences.yml
+5
-0
spec/features/profiles/user_visits_profile_preferences_page_spec.rb
...res/profiles/user_visits_profile_preferences_page_spec.rb
+2
-2
No files found.
app/assets/javascripts/main.js
View file @
803d3243
...
...
@@ -107,6 +107,7 @@ function deferredInitialisation() {
.
then
(()
=>
{
$
(
'
select.select2
'
).
select2
({
width
:
'
resolve
'
,
minimumResultsForSearch
:
10
,
dropdownAutoWidth
:
true
,
});
...
...
app/views/profiles/preferences/show.html.haml
View file @
803d3243
...
...
@@ -45,20 +45,20 @@
.form-group
=
f
.
label
:layout
,
class:
'label-bold'
do
=
s_
(
'Preferences|Layout width'
)
=
f
.
select
:layout
,
layout_choices
,
{},
class:
'
form-control
'
=
f
.
select
:layout
,
layout_choices
,
{},
class:
'
select2
'
.form-text.text-muted
=
s_
(
'Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.'
)
.form-group
=
f
.
label
:dashboard
,
class:
'label-bold'
do
=
s_
(
'Preferences|Default dashboard'
)
=
f
.
select
:dashboard
,
dashboard_choices
,
{},
class:
'
form-control
'
=
f
.
select
:dashboard
,
dashboard_choices
,
{},
class:
'
select2
'
=
render_if_exists
'profiles/preferences/group_overview_selector'
,
f:
f
# EE-specific
.form-group
=
f
.
label
:project_view
,
class:
'label-bold'
do
=
s_
(
'Preferences|Project overview content'
)
=
f
.
select
:project_view
,
project_view_choices
,
{},
class:
'
form-control
'
=
f
.
select
:project_view
,
project_view_choices
,
{},
class:
'
select2
'
.form-text.text-muted
=
s_
(
'Preferences|Choose what content you want to see on a project’s overview page.'
)
...
...
@@ -82,7 +82,7 @@
.form-group
=
f
.
label
:first_day_of_week
,
class:
'label-bold'
do
=
_
(
'First day of the week'
)
=
f
.
select
:first_day_of_week
,
first_day_of_week_choices_with_default
,
{},
class:
'
form-control
'
=
f
.
select
:first_day_of_week
,
first_day_of_week_choices_with_default
,
{},
class:
'
select2
'
-
if
Feature
.
enabled?
(
:user_time_settings
)
.col-sm-12
%hr
...
...
changelogs/unreleased/62286-Consistent-selection-elements-in-user-settings-preferences.yml
0 → 100644
View file @
803d3243
---
title
:
Harmonize selections in user settings
merge_request
:
31110
author
:
Marc Schwede
type
:
other
spec/features/profiles/user_visits_profile_preferences_page_spec.rb
View file @
803d3243
...
...
@@ -38,7 +38,7 @@ describe 'User visits the profile preferences page' do
describe
'User changes their default dashboard'
,
:js
do
it
'creates a flash message'
do
select
'Starred Projects'
,
from:
'user_dashboard'
select
2
(
'stars'
,
from:
'#user_dashboard'
)
click_button
'Save'
wait_for_requests
...
...
@@ -47,7 +47,7 @@ describe 'User visits the profile preferences page' do
end
it
'updates their preference'
do
select
'Starred Projects'
,
from:
'user_dashboard'
select
2
(
'stars'
,
from:
'#user_dashboard'
)
click_button
'Save'
wait_for_requests
...
...
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