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
f4eda673
Commit
f4eda673
authored
8 years ago
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the ref-selector function work properly for branch selection.
parent
41d598ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
app/assets/javascripts/project.js
app/assets/javascripts/project.js
+3
-2
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+2
-7
app/views/shared/_ref_switcher.html.haml
app/views/shared/_ref_switcher.html.haml
+1
-1
No files found.
app/assets/javascripts/project.js
View file @
f4eda673
...
...
@@ -65,7 +65,8 @@
url
:
$dropdown
.
data
(
'
refs-url
'
),
data
:
{
ref
:
$dropdown
.
data
(
'
ref
'
)
}
},
dataType
:
"
json
"
}).
done
(
function
(
refs
)
{
return
callback
(
refs
);
});
...
...
@@ -73,7 +74,7 @@
selectable
:
true
,
filterable
:
true
,
filterByText
:
true
,
fieldName
:
'
ref
'
,
fieldName
:
$dropdown
.
data
(
'
field-name
'
)
,
renderRow
:
function
(
ref
)
{
var
link
;
if
(
ref
.
header
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_change.html.haml
View file @
f4eda673
...
...
@@ -17,13 +17,8 @@
.form-group.branch
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
.col-sm-10
.dropdown
=
dropdown_toggle
@project
.
default_branch
,
{
toggle:
"dropdown"
,
selected:
@project
.
default_branch
,
ref:
@ref
,
refs_url:
branches_namespace_project_path
(
@project
.
namespace
,
@project
)
},
{
toggle_class:
"js-project-refs-dropdown js-target-branch"
}
.dropdown-menu.dropdown-menu-selectable
=
dropdown_title
"Switch branch"
=
dropdown_filter
"Search branches"
=
dropdown_content
=
dropdown_loading
=
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
}})
-
if
can?
(
current_user
,
:push_code
,
@project
)
.js-create-merge-request-container
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/_ref_switcher.html.haml
View file @
f4eda673
...
...
@@ -6,7 +6,7 @@
-
@options
&&
@options
.
each
do
|
key
,
value
|
=
hidden_field_tag
key
,
value
,
id:
nil
.dropdown
=
dropdown_toggle
dropdown_toggle_text
,
{
toggle:
"dropdown"
,
selected:
dropdown_toggle_text
,
ref:
@ref
,
refs_url:
refs_namespace_project_path
(
@project
.
namespace
,
@project
)
},
{
toggle_class:
"js-project-refs-dropdown"
}
=
dropdown_toggle
dropdown_toggle_text
,
{
toggle:
"dropdown"
,
selected:
dropdown_toggle_text
,
ref:
@ref
,
refs_url:
refs_namespace_project_path
(
@project
.
namespace
,
@project
)
,
field_name:
'ref'
,
submit_form_on_click:
true
},
{
toggle_class:
"js-project-refs-dropdown"
}
.dropdown-menu.dropdown-menu-selectable
{
class:
(
"dropdown-menu-align-right"
if
local_assigns
[
:align_right
])
}
=
dropdown_title
"Switch branch/tag"
=
dropdown_filter
"Search branches and tags"
...
...
This diff is collapsed.
Click to expand it.
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