diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-07 16:13:21 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-07 16:19:11 +0200 |
| commit | 7461072f36d88254b2bc5d696061c7c0f5b8fe86 (patch) | |
| tree | 4220436aac0fddd463eedbee92d9d57572a046f4 /app | |
| parent | 7cee650d0c75c0b9c229965711437779b847130f (diff) | |
| download | gitlab-ce-7461072f36d88254b2bc5d696061c7c0f5b8fe86.tar.gz | |
Update code to remove no longer needed changes
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/trigger.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/triggers/_form.html.haml | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb index d01fad44fda..b59e235c425 100644 --- a/app/models/ci/trigger.rb +++ b/app/models/ci/trigger.rb @@ -14,7 +14,7 @@ module Ci before_validation :set_default_values - accepts_nested_attributes_for :trigger_schedule, allow_destroy: true + accepts_nested_attributes_for :trigger_schedule def set_default_values self.token = SecureRandom.hex(15) if self.token.blank? diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml index 41e73f1e822..8ec2f05e3d6 100644 --- a/app/views/projects/triggers/_form.html.haml +++ b/app/views/projects/triggers/_form.html.haml @@ -31,9 +31,3 @@ = schedule_fields.text_field :ref, class: "form-control", title: 'Branch or tag is required.', placeholder: "master" .help-block Existing branch name, tag = f.submit btn_text, class: "btn btn-save" - - -:javascript - var availableRefs = #{@project.repository.ref_names.to_json}; - - new NewBranchForm($('.js-new-pipeline-form'), availableRefs) |