diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-30 10:32:05 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-07 07:37:05 +0300 |
| commit | d8d5424d25c1738b170d58657ef71d4dbc89ca5e (patch) | |
| tree | 98c3a9d5b892838dddfff900776a9df9d2652442 /app/controllers/projects/protected_branches_controller.rb | |
| parent | 10c446eaa2ca4b46f454bde7f9715dc839efa5b9 (diff) | |
Use the `GLDropdown` component to select protected branches.
1. Modify the component to support a callback for every key press in the
filter. We need this so we can update the "Create: <branch_name"
label.
2. Modify the component to use `$(<selector>).first().click()` instead
of `$(selector)[0].click()`, because the latter is non-standard, and
doesn't work in PhantomJS.
Diffstat (limited to 'app/controllers/projects/protected_branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index 026c5b74eb9..80dad758afa 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -9,7 +9,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController def index @protected_branches = @project.protected_branches.order(:name).page(params[:page]) @protected_branch = @project.protected_branches.new - gon.push({ open_branches: @project.open_branches.map { |br| { text: br.name, id: br.name } } }) + gon.push({ open_branches: @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } } }) end def create |