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
d0ecf1bb
Commit
d0ecf1bb
authored
May 10, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix new branch dropdown position and size
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/32096
parent
32cb7d63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
app/views/projects/branches/new.html.haml
app/views/projects/branches/new.html.haml
+7
-5
spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
...eatures/projects/branches/new_branch_ref_dropdown_spec.rb
+1
-1
No files found.
app/views/projects/branches/new.html.haml
View file @
d0ecf1bb
...
...
@@ -17,11 +17,13 @@
.help-block.text-danger.js-branch-name-error
.form-group
=
label_tag
:ref
,
'Create from'
,
class:
'control-label'
.col-sm-10.dropdown.create-from
=
hidden_field_tag
:ref
,
default_ref
=
button_tag
type:
'button'
,
title:
default_ref
,
class:
'dropdown-toggle form-control js-branch-select'
,
required:
true
,
data:
{
toggle:
'dropdown'
,
selected:
default_ref
,
field_name:
'ref'
}
do
.text-left.dropdown-toggle-text
=
default_ref
=
render
'shared/ref_dropdown'
,
dropdown_class:
'wide'
.col-sm-10.create-from
.dropdown
=
hidden_field_tag
:ref
,
default_ref
=
button_tag
type:
'button'
,
title:
default_ref
,
class:
'dropdown-menu-toggle wide form-control js-branch-select'
,
required:
true
,
data:
{
toggle:
'dropdown'
,
selected:
default_ref
,
field_name:
'ref'
}
do
.text-left.dropdown-toggle-text
=
default_ref
=
icon
(
'chevron-down'
)
=
render
'shared/ref_dropdown'
,
dropdown_class:
'wide'
.help-block
Existing branch name, tag, or commit SHA
.form-actions
=
button_tag
'Create branch'
,
class:
'btn btn-create'
,
tabindex:
3
...
...
spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
View file @
d0ecf1bb
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'New Branch Ref Dropdown'
,
:js
,
:feature
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:toggle
)
{
find
(
'.create-from .dropdown-toggle'
)
}
let
(
:toggle
)
{
find
(
'.create-from .dropdown-
menu-
toggle'
)
}
before
do
project
.
add_master
(
user
)
...
...
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