diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
| commit | 0b75b821c6cfd173291fcfd88c41da9922d082dd (patch) | |
| tree | 41b578d299bd77423aa3591955a4cb5ca07ab025 /app/controllers/projects/application_controller.rb | |
| parent | 6342da7bb6cbba1b1e026fc62a1da42b811b25f4 (diff) | |
| parent | a08c707c928092426e2334423e71c6b841309ddf (diff) | |
| download | gitlab-ce-issue-title-vue.tar.gz | |
update to current master and fix conflictsissue-title-vue
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index e2f81b09adc..f1a93ccb3ad 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -89,4 +89,9 @@ class Projects::ApplicationController < ApplicationController def builds_enabled return render_404 unless @project.feature_available?(:builds, current_user) end + + def update_ref + branch_exists = @repository.find_branch(@target_branch) + @ref = @target_branch if branch_exists + end end |