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
0bfef4bd
Commit
0bfef4bd
authored
Aug 02, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dynamic sizing for dropdown toggle, update Changelog.
Also resolve feedback.
parent
f4eda673
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+9
-0
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+1
-1
No files found.
CHANGELOG
View file @
0bfef4bd
...
@@ -57,6 +57,7 @@ v 8.11.0 (unreleased)
...
@@ -57,6 +57,7 @@ v 8.11.0 (unreleased)
- Trigram indexes for the "ci_runners" table have been removed to speed up UPDATE queries
- Trigram indexes for the "ci_runners" table have been removed to speed up UPDATE queries
- Fix devise deprecation warnings.
- Fix devise deprecation warnings.
- Update version_sorter and use new interface for faster tag sorting
- Update version_sorter and use new interface for faster tag sorting
- Load branches asynchronously in Cherry Pick and Revert dialogs.
- Optimize checking if a user has read access to a list of issues !5370
- Optimize checking if a user has read access to a list of issues !5370
- Store all DB secrets in secrets.yml, under descriptive names !5274
- Store all DB secrets in secrets.yml, under descriptive names !5274
- Nokogiri's various parsing methods are now instrumented
- Nokogiri's various parsing methods are now instrumented
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
0bfef4bd
...
@@ -84,6 +84,15 @@
...
@@ -84,6 +84,15 @@
width
:
100%
;
width
:
100%
;
}
}
}
}
// Allows dynamic-width text in the dropdown toggle.
// Resizes to allow long text without overflowing the container.
&
.dynamic
{
width
:
auto
;
min-width
:
160px
;
max-width
:
100%
;
padding-right
:
25px
;
}
}
}
.dropdown-menu
,
.dropdown-menu
,
...
...
app/views/projects/commit/_change.html.haml
View file @
0bfef4bd
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
hidden_field_tag
:target_branch
,
@project
.
default_branch
,
id:
'target_branch'
=
hidden_field_tag
:target_branch
,
@project
.
default_branch
,
id:
'target_branch'
=
dropdown_tag
(
@project
.
default_branch
,
options:
{
title:
"Switch branch"
,
filter:
true
,
placeholder:
"Search branches"
,
toggle_class:
'js-project-refs-dropdown js-target-branch'
,
dropdown_class:
'dropdown-menu-selectable'
,
data:
{
field_name:
"target_branch"
,
selected:
@project
.
default_branch
,
target_branch:
@project
.
default_branch
,
refs_url:
namespace_project_branches_path
(
@project
.
namespace
,
@project
),
submit_form_on_click:
false
}})
=
dropdown_tag
(
@project
.
default_branch
,
options:
{
title:
"Switch branch"
,
filter:
true
,
placeholder:
"Search branches"
,
toggle_class:
'js-project-refs-dropdown js-target-branch
dynamic
'
,
dropdown_class:
'dropdown-menu-selectable'
,
data:
{
field_name:
"target_branch"
,
selected:
@project
.
default_branch
,
target_branch:
@project
.
default_branch
,
refs_url:
namespace_project_branches_path
(
@project
.
namespace
,
@project
),
submit_form_on_click:
false
}})
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
.js-create-merge-request-container
.js-create-merge-request-container
...
...
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